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

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

Issue 506103002: Rename ApplicationLoader::OnServiceError to OnApplicationError (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Merge nits Created 6 years, 3 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/ui_application_loader_android.cc ('k') | mojo/shell/view_manager_loader.cc » ('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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_VIEW_MANAGER_LOADER_H_ 5 #ifndef MOJO_SHELL_VIEW_MANAGER_LOADER_H_
6 #define MOJO_SHELL_VIEW_MANAGER_LOADER_H_ 6 #define MOJO_SHELL_VIEW_MANAGER_LOADER_H_
7 7
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "base/memory/scoped_vector.h" 9 #include "base/memory/scoped_vector.h"
10 #include "mojo/application_manager/application_loader.h" 10 #include "mojo/application_manager/application_loader.h"
(...skipping 14 matching lines...) Expand all
25 public InterfaceFactory<ViewManagerInitService> { 25 public InterfaceFactory<ViewManagerInitService> {
26 public: 26 public:
27 ViewManagerLoader(); 27 ViewManagerLoader();
28 virtual ~ViewManagerLoader(); 28 virtual ~ViewManagerLoader();
29 29
30 private: 30 private:
31 // ApplicationLoader overrides: 31 // ApplicationLoader overrides:
32 virtual void Load(ApplicationManager* manager, 32 virtual void Load(ApplicationManager* manager,
33 const GURL& url, 33 const GURL& url,
34 scoped_refptr<LoadCallbacks> callbacks) OVERRIDE; 34 scoped_refptr<LoadCallbacks> callbacks) OVERRIDE;
35 virtual void OnServiceError(ApplicationManager* manager, 35 virtual void OnApplicationError(ApplicationManager* manager,
36 const GURL& url) OVERRIDE; 36 const GURL& url) OVERRIDE;
37 37
38 // ApplicationDelegate overrides. 38 // ApplicationDelegate overrides.
39 virtual bool ConfigureIncomingConnection( 39 virtual bool ConfigureIncomingConnection(
40 mojo::ApplicationConnection* connection) OVERRIDE; 40 mojo::ApplicationConnection* connection) OVERRIDE;
41 41
42 // InterfaceFactory<ViewManagerInitService> overrides. 42 // InterfaceFactory<ViewManagerInitService> overrides.
43 virtual void Create( 43 virtual void Create(
44 ApplicationConnection* connection, 44 ApplicationConnection* connection,
45 InterfaceRequest<ViewManagerInitService> request) OVERRIDE; 45 InterfaceRequest<ViewManagerInitService> request) OVERRIDE;
46 46
47 ScopedVector<Application> apps_; 47 ScopedVector<Application> apps_;
48 service::ViewManagerInitServiceContext context_; 48 service::ViewManagerInitServiceContext context_;
49 49
50 DISALLOW_COPY_AND_ASSIGN(ViewManagerLoader); 50 DISALLOW_COPY_AND_ASSIGN(ViewManagerLoader);
51 }; 51 };
52 52
53 } // namespace shell 53 } // namespace shell
54 } // namespace mojo 54 } // namespace mojo
55 55
56 #endif // MOJO_SHELL_VIEW_MANAGER_LOADER_H_ 56 #endif // MOJO_SHELL_VIEW_MANAGER_LOADER_H_
OLDNEW
« no previous file with comments | « mojo/shell/ui_application_loader_android.cc ('k') | mojo/shell/view_manager_loader.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698