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

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

Issue 619493002: Mojo: Convert OVERRIDE -> override in various subdirectories of 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
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 #ifndef MOJO_SHELL_CONTEXT_H_ 5 #ifndef MOJO_SHELL_CONTEXT_H_
6 #define MOJO_SHELL_CONTEXT_H_ 6 #define MOJO_SHELL_CONTEXT_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/macros.h"
10 #include "mojo/application_manager/application_manager.h" 11 #include "mojo/application_manager/application_manager.h"
11 #include "mojo/shell/mojo_url_resolver.h" 12 #include "mojo/shell/mojo_url_resolver.h"
12 #include "mojo/shell/task_runners.h" 13 #include "mojo/shell/task_runners.h"
13 14
14 #if defined(OS_ANDROID) 15 #if defined(OS_ANDROID)
15 #include "base/android/scoped_java_ref.h" 16 #include "base/android/scoped_java_ref.h"
16 #endif // defined(OS_ANDROID) 17 #endif // defined(OS_ANDROID)
17 18
18 namespace mojo { 19 namespace mojo {
19 20
20 class Spy; 21 class Spy;
21 22
22 namespace shell { 23 namespace shell {
23 24
24 class DynamicApplicationLoader; 25 class DynamicApplicationLoader;
25 class ExternalApplicationListener; 26 class ExternalApplicationListener;
26 27
27 // The "global" context for the shell's main process. 28 // The "global" context for the shell's main process.
28 class Context : ApplicationManager::Delegate { 29 class Context : ApplicationManager::Delegate {
29 public: 30 public:
30 Context(); 31 Context();
31 virtual ~Context(); 32 virtual ~Context();
32 33
33 void Init(); 34 void Init();
34 35
35 // ApplicationManager::Delegate override. 36 // ApplicationManager::Delegate override.
36 virtual void OnApplicationError(const GURL& gurl) OVERRIDE; 37 virtual void OnApplicationError(const GURL& gurl) override;
37 38
38 void Run(const GURL& url); 39 void Run(const GURL& url);
39 ScopedMessagePipeHandle ConnectToServiceByName( 40 ScopedMessagePipeHandle ConnectToServiceByName(
40 const GURL& application_url, 41 const GURL& application_url,
41 const std::string& service_name); 42 const std::string& service_name);
42 43
43 TaskRunners* task_runners() { return task_runners_.get(); } 44 TaskRunners* task_runners() { return task_runners_.get(); }
44 ApplicationManager* application_manager() { return &application_manager_; } 45 ApplicationManager* application_manager() { return &application_manager_; }
45 MojoURLResolver* mojo_url_resolver() { return &mojo_url_resolver_; } 46 MojoURLResolver* mojo_url_resolver() { return &mojo_url_resolver_; }
46 47
(...skipping 15 matching lines...) Expand all
62 base::MessageLoop* ui_loop_; 63 base::MessageLoop* ui_loop_;
63 #endif // defined(OS_ANDROID) 64 #endif // defined(OS_ANDROID)
64 65
65 DISALLOW_COPY_AND_ASSIGN(Context); 66 DISALLOW_COPY_AND_ASSIGN(Context);
66 }; 67 };
67 68
68 } // namespace shell 69 } // namespace shell
69 } // namespace mojo 70 } // namespace mojo
70 71
71 #endif // MOJO_SHELL_CONTEXT_H_ 72 #endif // MOJO_SHELL_CONTEXT_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698