summaryrefslogtreecommitdiffstats
path: root/mojo/shell
diff options
context:
space:
mode:
authorerg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-07-19 00:57:58 +0000
committererg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-07-19 00:57:58 +0000
commit3ecf8289a6e5d7e07b8e52cf1f3e40bf436e814c (patch)
tree72b3487aead1628b6375f783ff31646f67337ec6 /mojo/shell
parent1f6c86af09fd5fa00f4717040e57f276fecd46f2 (diff)
downloadchromium_src-3ecf8289a6e5d7e07b8e52cf1f3e40bf436e814c.zip
chromium_src-3ecf8289a6e5d7e07b8e52cf1f3e40bf436e814c.tar.gz
chromium_src-3ecf8289a6e5d7e07b8e52cf1f3e40bf436e814c.tar.bz2
mojo: Make InterfacePtr<> testable in if() statements without .get().
This also goes and changes a lot of "if (obj.get())" to "if (obj)". BUG=394639 Review URL: https://codereview.chromium.org/405653003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@284269 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'mojo/shell')
-rw-r--r--mojo/shell/dynamic_service_loader.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/mojo/shell/dynamic_service_loader.cc b/mojo/shell/dynamic_service_loader.cc
index 6f1fc80..5939d4b 100644
--- a/mojo/shell/dynamic_service_loader.cc
+++ b/mojo/shell/dynamic_service_loader.cc
@@ -167,7 +167,7 @@ void DynamicServiceLoader::LoadService(ServiceManager* manager,
if (resolved_url.SchemeIsFile()) {
loader = new LocalLoader(runner.Pass());
} else {
- if (!network_service_.get()) {
+ if (!network_service_) {
context_->service_manager()->ConnectToService(
GURL("mojo:mojo_network_service"),
&network_service_);