Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(258)

Side by Side Diff: mojo/shell/context.cc

Issue 668663006: Standardize usage of virtual/override/final in mojo/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « mojo/shell/context.h ('k') | mojo/shell/dynamic_application_loader.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "mojo/shell/context.h" 5 #include "mojo/shell/context.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 LOG(ERROR) << "Invalid value for switch " << switches::kContentHandlers 92 LOG(ERROR) << "Invalid value for switch " << switches::kContentHandlers
93 << ": '" << parts[i + 1] << "' is not a valid URL."; 93 << ": '" << parts[i + 1] << "' is not a valid URL.";
94 return; 94 return;
95 } 95 }
96 loader->RegisterContentHandler(parts[i], url); 96 loader->RegisterContentHandler(parts[i], url);
97 } 97 }
98 } 98 }
99 99
100 class EmptyServiceProvider : public InterfaceImpl<ServiceProvider> { 100 class EmptyServiceProvider : public InterfaceImpl<ServiceProvider> {
101 private: 101 private:
102 virtual void ConnectToService( 102 void ConnectToService(const mojo::String& service_name,
103 const mojo::String& service_name, 103 ScopedMessagePipeHandle client_handle) override {}
104 ScopedMessagePipeHandle client_handle) override {}
105 }; 104 };
106 105
107 } // namespace 106 } // namespace
108 107
109 #if defined(OS_ANDROID) 108 #if defined(OS_ANDROID)
110 class Context::NativeViewportApplicationLoader 109 class Context::NativeViewportApplicationLoader
111 : public ApplicationLoader, 110 : public ApplicationLoader,
112 public ApplicationDelegate, 111 public ApplicationDelegate,
113 public InterfaceFactory<NativeViewport>, 112 public InterfaceFactory<NativeViewport>,
114 public InterfaceFactory<Gpu> { 113 public InterfaceFactory<Gpu> {
(...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after
262 ScopedMessagePipeHandle Context::ConnectToServiceByName( 261 ScopedMessagePipeHandle Context::ConnectToServiceByName(
263 const GURL& application_url, 262 const GURL& application_url,
264 const std::string& service_name) { 263 const std::string& service_name) {
265 app_urls_.insert(application_url); 264 app_urls_.insert(application_url);
266 return application_manager_.ConnectToServiceByName( 265 return application_manager_.ConnectToServiceByName(
267 application_url, service_name).Pass(); 266 application_url, service_name).Pass();
268 } 267 }
269 268
270 } // namespace shell 269 } // namespace shell
271 } // namespace mojo 270 } // namespace mojo
OLDNEW
« no previous file with comments | « mojo/shell/context.h ('k') | mojo/shell/dynamic_application_loader.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698