Chromium Code Reviews| OLD | NEW |
|---|---|
| 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> |
| (...skipping 276 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 287 int child_process_id, | 287 int child_process_id, |
| 288 std::vector<content::FileDescriptorInfo>* mappings) OVERRIDE; | 288 std::vector<content::FileDescriptorInfo>* mappings) OVERRIDE; |
| 289 #endif | 289 #endif |
| 290 #if defined(OS_WIN) | 290 #if defined(OS_WIN) |
| 291 virtual const wchar_t* GetResourceDllName() OVERRIDE; | 291 virtual const wchar_t* GetResourceDllName() OVERRIDE; |
| 292 virtual void PreSpawnRenderer(sandbox::TargetPolicy* policy, | 292 virtual void PreSpawnRenderer(sandbox::TargetPolicy* policy, |
| 293 bool* success) OVERRIDE; | 293 bool* success) OVERRIDE; |
| 294 #endif | 294 #endif |
| 295 | 295 |
| 296 private: | 296 private: |
| 297 // Used as a callback once a permission has been decided. | |
| 298 // TODO(beverloo) remove once the notification callback returns | |
|
Peter Beverloo
2014/07/10 11:29:38
s/beverloo/peter/. Elsewhere too.
Miguel Garcia
2014/07/17 17:24:47
Done.
| |
| 299 // a boolean. | |
| 300 void NotificationPermissionRequested(base::Closure callback, bool result); | |
| 301 | |
| 297 #if defined(ENABLE_WEBRTC) | 302 #if defined(ENABLE_WEBRTC) |
| 298 // Copies disable WebRTC encryption switch depending on the channel. | 303 // Copies disable WebRTC encryption switch depending on the channel. |
| 299 static void MaybeCopyDisableWebRtcEncryptionSwitch( | 304 static void MaybeCopyDisableWebRtcEncryptionSwitch( |
| 300 base::CommandLine* to_command_line, | 305 base::CommandLine* to_command_line, |
| 301 const base::CommandLine& from_command_line, | 306 const base::CommandLine& from_command_line, |
| 302 VersionInfo::Channel channel); | 307 VersionInfo::Channel channel); |
| 303 #endif | 308 #endif |
| 304 | 309 |
| 305 #if defined(ENABLE_PLUGINS) | 310 #if defined(ENABLE_PLUGINS) |
| 306 // Set of origins that can use TCP/UDP private APIs from NaCl. | 311 // Set of origins that can use TCP/UDP private APIs from NaCl. |
| 307 std::set<std::string> allowed_socket_origins_; | 312 std::set<std::string> allowed_socket_origins_; |
| 308 // Set of origins that can get a handle for FileIO from NaCl. | 313 // Set of origins that can get a handle for FileIO from NaCl. |
| 309 std::set<std::string> allowed_file_handle_origins_; | 314 std::set<std::string> allowed_file_handle_origins_; |
| 310 // Set of origins that can use "dev chanel" APIs from NaCl, even on stable | 315 // Set of origins that can use "dev chanel" APIs from NaCl, even on stable |
| 311 // versions of Chrome. | 316 // versions of Chrome. |
| 312 std::set<std::string> allowed_dev_channel_origins_; | 317 std::set<std::string> allowed_dev_channel_origins_; |
| 313 #endif | 318 #endif |
| 314 scoped_ptr<extensions::BrowserPermissionsPolicyDelegate> | 319 scoped_ptr<extensions::BrowserPermissionsPolicyDelegate> |
| 315 permissions_policy_delegate_; | 320 permissions_policy_delegate_; |
| 316 | 321 |
| 317 // The prerender tracker used to determine whether a render process is used | 322 // The prerender tracker used to determine whether a render process is used |
| 318 // for prerendering and an override cookie store must be provided. | 323 // for prerendering and an override cookie store must be provided. |
| 319 // This needs to be kept as a member rather than just looked up from | 324 // This needs to be kept as a member rather than just looked up from |
| 320 // the profile due to initialization ordering, as well as due to threading. | 325 // the profile due to initialization ordering, as well as due to threading. |
| 321 // It is initialized on the UI thread when the ResoureDispatcherHost is | 326 // It is initialized on the UI thread when the ResoureDispatcherHost is |
| 322 // created. It is used only the IO thread. | 327 // created. It is used only the IO thread. |
| 323 prerender::PrerenderTracker* prerender_tracker_; | 328 prerender::PrerenderTracker* prerender_tracker_; |
| 324 | 329 |
| 330 // TODO(beverloo) remove once NotificationPermissionRequested is removed. | |
| 331 base::WeakPtrFactory<ChromeContentBrowserClient> weak_factory_; | |
|
Peter Beverloo
2014/07/10 11:29:38
#include "base/memory/weak_ptr.h"
(IWYU)
Miguel Garcia
2014/07/17 17:24:47
Done.
| |
| 332 | |
| 325 friend class DisableWebRtcEncryptionFlagTest; | 333 friend class DisableWebRtcEncryptionFlagTest; |
| 326 | 334 |
| 327 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient); | 335 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient); |
| 328 }; | 336 }; |
| 329 | 337 |
| 330 } // namespace chrome | 338 } // namespace chrome |
| 331 | 339 |
| 332 #endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ | 340 #endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ |
| OLD | NEW |