diff options
| author | ben <ben@chromium.org> | 2016-02-20 07:43:33 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-02-20 15:45:40 +0000 |
| commit | 13660a60987643b544be8dcc20e7a43eb7d7c196 (patch) | |
| tree | 86ecbd531cbec0d7d6316a673b61522faeb39828 /mojo/shell/background | |
| parent | 49b9a3e1bfcc078cbe8331342724751ab93c7e6c (diff) | |
| download | chromium_src-13660a60987643b544be8dcc20e7a43eb7d7c196.zip chromium_src-13660a60987643b544be8dcc20e7a43eb7d7c196.tar.gz chromium_src-13660a60987643b544be8dcc20e7a43eb7d7c196.tar.bz2 | |
Eliminate URLRequest from shell mojom & client library.
Rename mojom ConnectToApplication -> Connect() to match client library.
BUG=
CQ_INCLUDE_TRYBOTS=tryserver.chromium.linux:linux_site_isolation
Review URL: https://codereview.chromium.org/1710233002
Cr-Commit-Position: refs/heads/master@{#376647}
Diffstat (limited to 'mojo/shell/background')
| -rw-r--r-- | mojo/shell/background/background_shell.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mojo/shell/background/background_shell.cc b/mojo/shell/background/background_shell.cc index 50eef9c..0fdba19 100644 --- a/mojo/shell/background/background_shell.cc +++ b/mojo/shell/background/background_shell.cc @@ -15,7 +15,7 @@ #include "mojo/shell/application_loader.h" #include "mojo/shell/application_manager.h" #include "mojo/shell/capability_filter.h" -#include "mojo/shell/connect_to_application_params.h" +#include "mojo/shell/connect_params.h" #include "mojo/shell/public/cpp/shell_client.h" #include "mojo/shell/public/cpp/shell_connection.h" #include "mojo/shell/standalone/context.h" @@ -79,7 +79,7 @@ class BackgroundShell::MojoThread : public base::SimpleThread { ~MojoThread() override {} void CreateShellClientRequest(base::WaitableEvent* signal, - scoped_ptr<ConnectToApplicationParams> params, + scoped_ptr<ConnectParams> params, mojom::ShellClientRequest* request) { // Only valid to call this on the background thread. DCHECK_EQ(message_loop_, base::MessageLoop::current()); @@ -91,7 +91,7 @@ class BackgroundShell::MojoThread : public base::SimpleThread { url, signal, request)); context_->application_manager()->SetLoaderForURL(make_scoped_ptr(loader), url); - context_->application_manager()->ConnectToApplication(std::move(params)); + context_->application_manager()->Connect(std::move(params)); // The request is asynchronously processed. When processed // OnGotApplicationRequest() is called and we'll signal |signal|. } @@ -176,7 +176,7 @@ void BackgroundShell::Init( mojom::ShellClientRequest BackgroundShell::CreateShellClientRequest( const GURL& url) { - scoped_ptr<ConnectToApplicationParams> params(new ConnectToApplicationParams); + scoped_ptr<ConnectParams> params(new ConnectParams); params->set_target( Identity(url, std::string(), GetPermissiveCapabilityFilter())); mojom::ShellClientRequest request; |