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

Side by Side Diff: chrome/browser/chrome_content_browser_client.h

Issue 196413016: Move CommandLine to base namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 9 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ 5 #ifndef CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_
6 #define CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ 6 #define CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_
7 7
8 #include <set> 8 #include <set>
9 #include <string> 9 #include <string>
10 #include <utility> 10 #include <utility>
11 #include <vector> 11 #include <vector>
12 12
13 #include "base/compiler_specific.h" 13 #include "base/compiler_specific.h"
14 #include "base/gtest_prod_util.h" 14 #include "base/gtest_prod_util.h"
15 #include "chrome/common/chrome_version_info.h" 15 #include "chrome/common/chrome_version_info.h"
16 #include "content/public/browser/content_browser_client.h" 16 #include "content/public/browser/content_browser_client.h"
17 17
18 #if defined(OS_ANDROID) 18 #if defined(OS_ANDROID)
19 #include "base/memory/scoped_ptr.h" 19 #include "base/memory/scoped_ptr.h"
20 #endif 20 #endif
21 21
22 namespace base {
23 class CommandLine;
24 }
25
22 namespace content { 26 namespace content {
23 class QuotaPermissionContext; 27 class QuotaPermissionContext;
24 } 28 }
25 29
26 namespace extensions { 30 namespace extensions {
27 class BrowserPermissionsPolicyDelegate; 31 class BrowserPermissionsPolicyDelegate;
28 } 32 }
29 33
30 namespace user_prefs { 34 namespace user_prefs {
31 class PrefRegistrySyncable; 35 class PrefRegistrySyncable;
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
110 content::SiteInstance* site_instance, 114 content::SiteInstance* site_instance,
111 const GURL& current_url, 115 const GURL& current_url,
112 const GURL& new_url) OVERRIDE; 116 const GURL& new_url) OVERRIDE;
113 virtual bool ShouldSwapProcessesForRedirect( 117 virtual bool ShouldSwapProcessesForRedirect(
114 content::ResourceContext* resource_context, 118 content::ResourceContext* resource_context,
115 const GURL& current_url, 119 const GURL& current_url,
116 const GURL& new_url) OVERRIDE; 120 const GURL& new_url) OVERRIDE;
117 virtual bool ShouldAssignSiteForURL(const GURL& url) OVERRIDE; 121 virtual bool ShouldAssignSiteForURL(const GURL& url) OVERRIDE;
118 virtual std::string GetCanonicalEncodingNameByAliasName( 122 virtual std::string GetCanonicalEncodingNameByAliasName(
119 const std::string& alias_name) OVERRIDE; 123 const std::string& alias_name) OVERRIDE;
120 virtual void AppendExtraCommandLineSwitches(CommandLine* command_line, 124 virtual void AppendExtraCommandLineSwitches(base::CommandLine* command_line,
121 int child_process_id) OVERRIDE; 125 int child_process_id) OVERRIDE;
122 virtual std::string GetApplicationLocale() OVERRIDE; 126 virtual std::string GetApplicationLocale() OVERRIDE;
123 virtual std::string GetAcceptLangs( 127 virtual std::string GetAcceptLangs(
124 content::BrowserContext* context) OVERRIDE; 128 content::BrowserContext* context) OVERRIDE;
125 virtual gfx::ImageSkia* GetDefaultFavicon() OVERRIDE; 129 virtual gfx::ImageSkia* GetDefaultFavicon() OVERRIDE;
126 virtual bool AllowAppCache(const GURL& manifest_url, 130 virtual bool AllowAppCache(const GURL& manifest_url,
127 const GURL& first_party, 131 const GURL& first_party,
128 content::ResourceContext* context) OVERRIDE; 132 content::ResourceContext* context) OVERRIDE;
129 virtual bool AllowGetCookie(const GURL& url, 133 virtual bool AllowGetCookie(const GURL& url,
130 const GURL& first_party, 134 const GURL& first_party,
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
254 content::WebContents* web_contents) OVERRIDE; 258 content::WebContents* web_contents) OVERRIDE;
255 virtual void GetAdditionalAllowedSchemesForFileSystem( 259 virtual void GetAdditionalAllowedSchemesForFileSystem(
256 std::vector<std::string>* additional_schemes) OVERRIDE; 260 std::vector<std::string>* additional_schemes) OVERRIDE;
257 virtual void GetAdditionalFileSystemBackends( 261 virtual void GetAdditionalFileSystemBackends(
258 content::BrowserContext* browser_context, 262 content::BrowserContext* browser_context,
259 const base::FilePath& storage_partition_path, 263 const base::FilePath& storage_partition_path,
260 ScopedVector<fileapi::FileSystemBackend>* additional_backends) OVERRIDE; 264 ScopedVector<fileapi::FileSystemBackend>* additional_backends) OVERRIDE;
261 265
262 #if defined(OS_POSIX) && !defined(OS_MACOSX) 266 #if defined(OS_POSIX) && !defined(OS_MACOSX)
263 virtual void GetAdditionalMappedFilesForChildProcess( 267 virtual void GetAdditionalMappedFilesForChildProcess(
264 const CommandLine& command_line, 268 const base::CommandLine& command_line,
265 int child_process_id, 269 int child_process_id,
266 std::vector<content::FileDescriptorInfo>* mappings) OVERRIDE; 270 std::vector<content::FileDescriptorInfo>* mappings) OVERRIDE;
267 #endif 271 #endif
268 #if defined(OS_WIN) 272 #if defined(OS_WIN)
269 virtual const wchar_t* GetResourceDllName() OVERRIDE; 273 virtual const wchar_t* GetResourceDllName() OVERRIDE;
270 virtual void PreSpawnRenderer(sandbox::TargetPolicy* policy, 274 virtual void PreSpawnRenderer(sandbox::TargetPolicy* policy,
271 bool* success) OVERRIDE; 275 bool* success) OVERRIDE;
272 #endif 276 #endif
273 277
274 virtual bool IsPluginAllowedToCallRequestOSFileHandle( 278 virtual bool IsPluginAllowedToCallRequestOSFileHandle(
275 content::BrowserContext* browser_context, 279 content::BrowserContext* browser_context,
276 const GURL& url) OVERRIDE; 280 const GURL& url) OVERRIDE;
277 281
278 virtual bool IsPluginAllowedToUseDevChannelAPIs() OVERRIDE; 282 virtual bool IsPluginAllowedToUseDevChannelAPIs() OVERRIDE;
279 283
280 private: 284 private:
281 #if defined(ENABLE_WEBRTC) 285 #if defined(ENABLE_WEBRTC)
282 // Copies disable WebRTC encryption switch depending on the channel. 286 // Copies disable WebRTC encryption switch depending on the channel.
283 static void MaybeCopyDisableWebRtcEncryptionSwitch( 287 static void MaybeCopyDisableWebRtcEncryptionSwitch(
284 CommandLine* to_command_line, 288 base::CommandLine* to_command_line,
285 const CommandLine& from_command_line, 289 const base::CommandLine& from_command_line,
286 VersionInfo::Channel channel); 290 VersionInfo::Channel channel);
287 #endif 291 #endif
288 292
289 #if defined(ENABLE_PLUGINS) 293 #if defined(ENABLE_PLUGINS)
290 // Set of origins that can use TCP/UDP private APIs from NaCl. 294 // Set of origins that can use TCP/UDP private APIs from NaCl.
291 std::set<std::string> allowed_socket_origins_; 295 std::set<std::string> allowed_socket_origins_;
292 // Set of origins that can get a handle for FileIO from NaCl. 296 // Set of origins that can get a handle for FileIO from NaCl.
293 std::set<std::string> allowed_file_handle_origins_; 297 std::set<std::string> allowed_file_handle_origins_;
294 #endif 298 #endif
295 scoped_ptr<extensions::BrowserPermissionsPolicyDelegate> 299 scoped_ptr<extensions::BrowserPermissionsPolicyDelegate>
296 permissions_policy_delegate_; 300 permissions_policy_delegate_;
297 301
298 friend class DisableWebRtcEncryptionFlagTest; 302 friend class DisableWebRtcEncryptionFlagTest;
299 303
300 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient); 304 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient);
301 }; 305 };
302 306
303 } // namespace chrome 307 } // namespace chrome
304 308
305 #endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ 309 #endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_
OLDNEW
« no previous file with comments | « chrome/browser/chrome_browser_main_win.h ('k') | chrome/browser/chromeos/login/chrome_restart_request.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698