summaryrefslogtreecommitdiffstats
path: root/mojo/shell/background
diff options
context:
space:
mode:
authorben <ben@chromium.org>2016-02-24 14:17:22 -0800
committerCommit bot <commit-bot@chromium.org>2016-02-24 22:19:40 +0000
commit1a1f457e6c1d5ad1bc8816e443f3f7e2fe037333 (patch)
tree419f9edefcb7e6484c64c6ce409b9f8e006ca0d5 /mojo/shell/background
parentb91db5809d1122ee4356f395dbf7b1808d1a1f21 (diff)
downloadchromium_src-1a1f457e6c1d5ad1bc8816e443f3f7e2fe037333.zip
chromium_src-1a1f457e6c1d5ad1bc8816e443f3f7e2fe037333.tar.gz
chromium_src-1a1f457e6c1d5ad1bc8816e443f3f7e2fe037333.tar.bz2
One feature of MojoShellContext in content is that Connect() can be called from any thread. If we want to replace this class we need this ability in the Mojo Shell client lib too. To this end I've extracted the Connect() method to its own interface which can be constructed from Shell. This interface can be cloned and passed on to other threads also.
R=sky@chromium.org BUG= CQ_INCLUDE_TRYBOTS=tryserver.chromium.linux:linux_site_isolation Review URL: https://codereview.chromium.org/1728083002 Cr-Commit-Position: refs/heads/master@{#377407}
Diffstat (limited to 'mojo/shell/background')
-rw-r--r--mojo/shell/background/background_shell.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/mojo/shell/background/background_shell.cc b/mojo/shell/background/background_shell.cc
index a4b6c5e..4ee5c7e 100644
--- a/mojo/shell/background/background_shell.cc
+++ b/mojo/shell/background/background_shell.cc
@@ -176,7 +176,7 @@ mojom::ShellClientRequest BackgroundShell::CreateShellClientRequest(
const GURL& url) {
scoped_ptr<ConnectParams> params(new ConnectParams);
params->set_target(
- Identity(url, std::string(), mojom::Shell::kUserRoot,
+ Identity(url, std::string(), mojom::Connector::kUserRoot,
GetPermissiveCapabilityFilter()));
mojom::ShellClientRequest request;
base::WaitableEvent signal(true, false);