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> |
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 "base/memory/scoped_ptr.h" | 15 #include "base/memory/scoped_ptr.h" |
| 16 #include "base/memory/weak_ptr.h" |
16 #include "chrome/common/chrome_version_info.h" | 17 #include "chrome/common/chrome_version_info.h" |
17 #include "content/public/browser/content_browser_client.h" | 18 #include "content/public/browser/content_browser_client.h" |
18 | 19 |
19 namespace base { | 20 namespace base { |
20 class CommandLine; | 21 class CommandLine; |
21 } | 22 } |
22 | 23 |
23 namespace content { | 24 namespace content { |
24 class QuotaPermissionContext; | 25 class QuotaPermissionContext; |
25 } | 26 } |
(...skipping 264 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
290 #endif | 291 #endif |
291 #if defined(OS_WIN) | 292 #if defined(OS_WIN) |
292 virtual const wchar_t* GetResourceDllName() OVERRIDE; | 293 virtual const wchar_t* GetResourceDllName() OVERRIDE; |
293 virtual void PreSpawnRenderer(sandbox::TargetPolicy* policy, | 294 virtual void PreSpawnRenderer(sandbox::TargetPolicy* policy, |
294 bool* success) OVERRIDE; | 295 bool* success) OVERRIDE; |
295 #endif | 296 #endif |
296 | 297 |
297 private: | 298 private: |
298 friend class DisableWebRtcEncryptionFlagTest; | 299 friend class DisableWebRtcEncryptionFlagTest; |
299 | 300 |
| 301 // Used as a callback once a permission has been decided. |
| 302 // TODO(peter) remove once the notification callback returns |
| 303 // a boolean. |
| 304 void NotificationPermissionRequested( |
| 305 const base::Closure& callback, bool result); |
| 306 |
300 #if defined(ENABLE_WEBRTC) | 307 #if defined(ENABLE_WEBRTC) |
301 // Copies disable WebRTC encryption switch depending on the channel. | 308 // Copies disable WebRTC encryption switch depending on the channel. |
302 static void MaybeCopyDisableWebRtcEncryptionSwitch( | 309 static void MaybeCopyDisableWebRtcEncryptionSwitch( |
303 base::CommandLine* to_command_line, | 310 base::CommandLine* to_command_line, |
304 const base::CommandLine& from_command_line, | 311 const base::CommandLine& from_command_line, |
305 VersionInfo::Channel channel); | 312 VersionInfo::Channel channel); |
306 #endif | 313 #endif |
307 | 314 |
308 void FileSystemAccessed( | 315 void FileSystemAccessed( |
309 const GURL& url, | 316 const GURL& url, |
(...skipping 29 matching lines...) Expand all Loading... |
339 permissions_policy_delegate_; | 346 permissions_policy_delegate_; |
340 | 347 |
341 // The prerender tracker used to determine whether a render process is used | 348 // The prerender tracker used to determine whether a render process is used |
342 // for prerendering and an override cookie store must be provided. | 349 // for prerendering and an override cookie store must be provided. |
343 // This needs to be kept as a member rather than just looked up from | 350 // This needs to be kept as a member rather than just looked up from |
344 // the profile due to initialization ordering, as well as due to threading. | 351 // the profile due to initialization ordering, as well as due to threading. |
345 // It is initialized on the UI thread when the ResoureDispatcherHost is | 352 // It is initialized on the UI thread when the ResoureDispatcherHost is |
346 // created. It is used only the IO thread. | 353 // created. It is used only the IO thread. |
347 prerender::PrerenderTracker* prerender_tracker_; | 354 prerender::PrerenderTracker* prerender_tracker_; |
348 | 355 |
| 356 // TODO(peter) remove once NotificationPermissionRequested is removed. |
349 base::WeakPtrFactory<ChromeContentBrowserClient> weak_factory_; | 357 base::WeakPtrFactory<ChromeContentBrowserClient> weak_factory_; |
350 | 358 |
351 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient); | 359 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient); |
352 }; | 360 }; |
353 | 361 |
354 } // namespace chrome | 362 } // namespace chrome |
355 | 363 |
356 #endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ | 364 #endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ |
OLD | NEW |