DEV/flutter_flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2026-02-20 02:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Port more String and HashMap usages

Browse Source 
BUG=
R=abarth@chromium.org

Review URL: https://codereview.chromium.org/1237973004 .
This commit is contained in:
John McCutchan 2015-07-16 07:30:56 -07:00
parent dad9c040b8
commit 2e1acfeafa
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
engine/src/flutter/shell/dart/dart_library_provider_files.cc
View File

@ -50,12 +50,12 @@ DartLibraryProviderFiles::~DartLibraryProviderFiles() {
}
void DartLibraryProviderFiles::GetLibraryAsStream(
const String& name,
const std::string& name,
blink::DataPipeConsumerCallback callback) {
mojo::DataPipe pipe;
callback.Run(pipe.consumer_handle.Pass());
base::FilePath source(name.toUTF8());
base::FilePath source(name);
scoped_refptr<base::TaskRunner> runner =
base::WorkerPool::GetTaskRunner(true);
mojo::common::CopyFromFile(source, pipe.producer_handle.Pass(), 0,

2
engine/src/flutter/shell/dart/dart_library_provider_files.h
View File

@ -18,7 +18,7 @@ class DartLibraryProviderFiles : public blink::DartLibraryProvider {
protected:
// |DartLibraryProvider| implementation:
void GetLibraryAsStream(const String& name,
void GetLibraryAsStream(const std::string& name,
blink::DataPipeConsumerCallback callback) override;
Dart_Handle CanonicalizeURL(Dart_Handle library, Dart_Handle url) override;

8
engine/src/flutter/shell/dart/dart_library_provider_network.cc
View File

@ -14,13 +14,13 @@ namespace shell {
namespace {
mojo::URLLoaderPtr Fetch(mojo::NetworkService* network_service,
const String& url,
const std::string& url,
base::Callback<void(mojo::URLResponsePtr)> callback) {
mojo::URLLoaderPtr loader;
network_service->CreateURLLoader(GetProxy(&loader));
mojo::URLRequestPtr request = mojo::URLRequest::New();
request->url = url.toUTF8();
request->url = url;
request->auto_follow_redirects = true;
loader->Start(request.Pass(), callback);
@ -32,7 +32,7 @@ mojo::URLLoaderPtr Fetch(mojo::NetworkService* network_service,
class DartLibraryProviderNetwork::Job {
public:
Job(DartLibraryProviderNetwork* provider,
const String& name,
const std::string& name,
blink::DataPipeConsumerCallback callback)
: provider_(provider), callback_(callback), weak_factory_(this) {
url_loader_ =
@ -66,7 +66,7 @@ DartLibraryProviderNetwork::~DartLibraryProviderNetwork() {
}
void DartLibraryProviderNetwork::GetLibraryAsStream(
const String& name,
const std::string& name,
blink::DataPipeConsumerCallback callback) {
jobs_.add(adoptPtr(new Job(this, name, callback)));
}

2
engine/src/flutter/shell/dart/dart_library_provider_network.h
View File

@ -22,7 +22,7 @@ class DartLibraryProviderNetwork : public blink::DartLibraryProvider {
protected:
// |DartLibraryProvider| implementation:
void GetLibraryAsStream(const String& name,
void GetLibraryAsStream(const std::string& name,
blink::DataPipeConsumerCallback callback) override;
Dart_Handle CanonicalizeURL(Dart_Handle library, Dart_Handle url) override;