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

Side by Side Diff: mojo/shell/network_application_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/dynamic_application_loader.cc ('k') | mojo/shell/network_application_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_NETWORK_APPLICATION_LOADER_H_ 5 #ifndef MOJO_SHELL_NETWORK_APPLICATION_LOADER_H_
6 #define MOJO_SHELL_NETWORK_APPLICATION_LOADER_H_ 6 #define MOJO_SHELL_NETWORK_APPLICATION_LOADER_H_
7 7
8 #include <map> 8 #include <map>
9 9
10 #include "base/containers/scoped_ptr_hash_map.h" 10 #include "base/containers/scoped_ptr_hash_map.h"
(...skipping 16 matching lines...) Expand all
27 public InterfaceFactory<NetworkService> { 27 public InterfaceFactory<NetworkService> {
28 public: 28 public:
29 NetworkApplicationLoader(); 29 NetworkApplicationLoader();
30 virtual ~NetworkApplicationLoader(); 30 virtual ~NetworkApplicationLoader();
31 31
32 private: 32 private:
33 // ApplicationLoader overrides: 33 // ApplicationLoader overrides:
34 virtual void Load(ApplicationManager* manager, 34 virtual void Load(ApplicationManager* manager,
35 const GURL& url, 35 const GURL& url,
36 scoped_refptr<LoadCallbacks> callbacks) OVERRIDE; 36 scoped_refptr<LoadCallbacks> callbacks) OVERRIDE;
37 virtual void OnServiceError(ApplicationManager* manager, 37 virtual void OnApplicationError(ApplicationManager* manager,
38 const GURL& url) OVERRIDE; 38 const GURL& url) OVERRIDE;
39 39
40 // ApplicationDelegate overrides. 40 // ApplicationDelegate overrides.
41 virtual void Initialize(ApplicationImpl* app) OVERRIDE; 41 virtual void Initialize(ApplicationImpl* app) OVERRIDE;
42 virtual bool ConfigureIncomingConnection( 42 virtual bool ConfigureIncomingConnection(
43 ApplicationConnection* connection) OVERRIDE; 43 ApplicationConnection* connection) OVERRIDE;
44 44
45 // InterfaceFactory<NetworkService> overrides. 45 // InterfaceFactory<NetworkService> overrides.
46 virtual void Create(ApplicationConnection* connection, 46 virtual void Create(ApplicationConnection* connection,
47 InterfaceRequest<NetworkService> request) OVERRIDE; 47 InterfaceRequest<NetworkService> request) OVERRIDE;
48 48
49 base::ScopedPtrHashMap<uintptr_t, ApplicationImpl> apps_; 49 base::ScopedPtrHashMap<uintptr_t, ApplicationImpl> apps_;
50 scoped_ptr<NetworkContext> context_; 50 scoped_ptr<NetworkContext> context_;
51 51
52 DISALLOW_COPY_AND_ASSIGN(NetworkApplicationLoader); 52 DISALLOW_COPY_AND_ASSIGN(NetworkApplicationLoader);
53 }; 53 };
54 54
55 } // namespace shell 55 } // namespace shell
56 } // namespace mojo 56 } // namespace mojo
57 57
58 #endif // MOJO_SHELL_NETWORK_APPLICATION_LOADER_H_ 58 #endif // MOJO_SHELL_NETWORK_APPLICATION_LOADER_H_
OLDNEW
« no previous file with comments | « mojo/shell/dynamic_application_loader.cc ('k') | mojo/shell/network_application_loader.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698