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

Side by Side Diff: extensions/shell/browser/shell_browser_main_parts.h

Issue 803313003: Rename omaha_client and similar tokens to update_client in all contexts. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@lkgr
Patch Set: rebase to master Created 5 years, 11 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 | « extensions/shell/browser/DEPS ('k') | extensions/shell/browser/shell_browser_main_parts.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 EXTENSIONS_SHELL_BROWSER_SHELL_BROWSER_MAIN_PARTS_H_ 5 #ifndef EXTENSIONS_SHELL_BROWSER_SHELL_BROWSER_MAIN_PARTS_H_
6 #define EXTENSIONS_SHELL_BROWSER_SHELL_BROWSER_MAIN_PARTS_H_ 6 #define EXTENSIONS_SHELL_BROWSER_SHELL_BROWSER_MAIN_PARTS_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 18 matching lines...) Expand all
29 29
30 class AppWindowClient; 30 class AppWindowClient;
31 class DesktopController; 31 class DesktopController;
32 class ExtensionsBrowserClient; 32 class ExtensionsBrowserClient;
33 class ExtensionsClient; 33 class ExtensionsClient;
34 class ShellBrowserContext; 34 class ShellBrowserContext;
35 class ShellBrowserMainDelegate; 35 class ShellBrowserMainDelegate;
36 class ShellDeviceClient; 36 class ShellDeviceClient;
37 class ShellExtensionSystem; 37 class ShellExtensionSystem;
38 class ShellOAuth2TokenService; 38 class ShellOAuth2TokenService;
39 class ShellOmahaQueryParamsDelegate; 39 class ShellUpdateQueryParamsDelegate;
40 40
41 #if defined(OS_CHROMEOS) 41 #if defined(OS_CHROMEOS)
42 class ShellAudioController; 42 class ShellAudioController;
43 class ShellNetworkController; 43 class ShellNetworkController;
44 #endif 44 #endif
45 45
46 // Handles initialization of AppShell. 46 // Handles initialization of AppShell.
47 class ShellBrowserMainParts : public content::BrowserMainParts { 47 class ShellBrowserMainParts : public content::BrowserMainParts {
48 public: 48 public:
49 ShellBrowserMainParts(const content::MainFunctionParams& parameters, 49 ShellBrowserMainParts(const content::MainFunctionParams& parameters,
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
82 #endif 82 #endif
83 scoped_ptr<DesktopController> desktop_controller_; 83 scoped_ptr<DesktopController> desktop_controller_;
84 scoped_ptr<ShellBrowserContext> browser_context_; 84 scoped_ptr<ShellBrowserContext> browser_context_;
85 scoped_ptr<PrefService> local_state_; 85 scoped_ptr<PrefService> local_state_;
86 scoped_ptr<PrefService> user_pref_service_; 86 scoped_ptr<PrefService> user_pref_service_;
87 scoped_ptr<ShellDeviceClient> device_client_; 87 scoped_ptr<ShellDeviceClient> device_client_;
88 scoped_ptr<AppWindowClient> app_window_client_; 88 scoped_ptr<AppWindowClient> app_window_client_;
89 scoped_ptr<ExtensionsClient> extensions_client_; 89 scoped_ptr<ExtensionsClient> extensions_client_;
90 scoped_ptr<ExtensionsBrowserClient> extensions_browser_client_; 90 scoped_ptr<ExtensionsBrowserClient> extensions_browser_client_;
91 scoped_ptr<content::DevToolsHttpHandler> devtools_http_handler_; 91 scoped_ptr<content::DevToolsHttpHandler> devtools_http_handler_;
92 scoped_ptr<ShellOmahaQueryParamsDelegate> omaha_query_params_delegate_; 92 scoped_ptr<ShellUpdateQueryParamsDelegate> update_query_params_delegate_;
93 scoped_ptr<ShellOAuth2TokenService> oauth2_token_service_; 93 scoped_ptr<ShellOAuth2TokenService> oauth2_token_service_;
94 94
95 // Owned by the KeyedService system. 95 // Owned by the KeyedService system.
96 ShellExtensionSystem* extension_system_; 96 ShellExtensionSystem* extension_system_;
97 97
98 // For running app browsertests. 98 // For running app browsertests.
99 const content::MainFunctionParams parameters_; 99 const content::MainFunctionParams parameters_;
100 100
101 // If true, indicates the main message loop should be run 101 // If true, indicates the main message loop should be run
102 // in MainMessageLoopRun. If false, it has already been run. 102 // in MainMessageLoopRun. If false, it has already been run.
103 bool run_message_loop_; 103 bool run_message_loop_;
104 104
105 scoped_ptr<ShellBrowserMainDelegate> browser_main_delegate_; 105 scoped_ptr<ShellBrowserMainDelegate> browser_main_delegate_;
106 106
107 #if !defined(DISABLE_NACL) 107 #if !defined(DISABLE_NACL)
108 base::CancelableTaskTracker task_tracker_; 108 base::CancelableTaskTracker task_tracker_;
109 #endif 109 #endif
110 110
111 DISALLOW_COPY_AND_ASSIGN(ShellBrowserMainParts); 111 DISALLOW_COPY_AND_ASSIGN(ShellBrowserMainParts);
112 }; 112 };
113 113
114 } // namespace extensions 114 } // namespace extensions
115 115
116 #endif // EXTENSIONS_SHELL_BROWSER_SHELL_BROWSER_MAIN_PARTS_H_ 116 #endif // EXTENSIONS_SHELL_BROWSER_SHELL_BROWSER_MAIN_PARTS_H_
OLDNEW
« no previous file with comments | « extensions/shell/browser/DEPS ('k') | extensions/shell/browser/shell_browser_main_parts.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698