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 "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 class Profile; | |
23 | |
22 namespace base { | 24 namespace base { |
23 class CommandLine; | 25 class CommandLine; |
24 } | 26 } |
25 | 27 |
26 namespace content { | 28 namespace content { |
27 class QuotaPermissionContext; | 29 class QuotaPermissionContext; |
28 } | 30 } |
29 | 31 |
30 namespace extensions { | 32 namespace extensions { |
31 class BrowserPermissionsPolicyDelegate; | 33 class BrowserPermissionsPolicyDelegate; |
(...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
205 bool user_gesture, | 207 bool user_gesture, |
206 base::Callback<void(bool)> result_callback, | 208 base::Callback<void(bool)> result_callback, |
207 base::Closure* cancel_callback) OVERRIDE; | 209 base::Closure* cancel_callback) OVERRIDE; |
208 virtual void RequestMidiSysExPermission( | 210 virtual void RequestMidiSysExPermission( |
209 content::WebContents* web_contents, | 211 content::WebContents* web_contents, |
210 int bridge_id, | 212 int bridge_id, |
211 const GURL& requesting_frame, | 213 const GURL& requesting_frame, |
212 bool user_gesture, | 214 bool user_gesture, |
213 base::Callback<void(bool)> result_callback, | 215 base::Callback<void(bool)> result_callback, |
214 base::Closure* cancel_callback) OVERRIDE; | 216 base::Closure* cancel_callback) OVERRIDE; |
217 virtual void UseContentSettingPermission( | |
218 content::WebContents* web_contents, | |
219 const GURL& primary_url, | |
220 const GURL& secondary_url, | |
221 const std::string& setting_type) OVERRIDE; | |
215 virtual void RequestProtectedMediaIdentifierPermission( | 222 virtual void RequestProtectedMediaIdentifierPermission( |
216 content::WebContents* web_contents, | 223 content::WebContents* web_contents, |
217 const GURL& origin, | 224 const GURL& origin, |
218 base::Callback<void(bool)> result_callback, | 225 base::Callback<void(bool)> result_callback, |
219 base::Closure* cancel_callback) OVERRIDE; | 226 base::Closure* cancel_callback) OVERRIDE; |
220 virtual bool CanCreateWindow(const GURL& opener_url, | 227 virtual bool CanCreateWindow(const GURL& opener_url, |
221 const GURL& opener_top_level_frame_url, | 228 const GURL& opener_top_level_frame_url, |
222 const GURL& source_origin, | 229 const GURL& source_origin, |
223 WindowContainerType container_type, | 230 WindowContainerType container_type, |
224 const GURL& target_url, | 231 const GURL& target_url, |
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
287 int child_process_id, | 294 int child_process_id, |
288 std::vector<content::FileDescriptorInfo>* mappings) OVERRIDE; | 295 std::vector<content::FileDescriptorInfo>* mappings) OVERRIDE; |
289 #endif | 296 #endif |
290 #if defined(OS_WIN) | 297 #if defined(OS_WIN) |
291 virtual const wchar_t* GetResourceDllName() OVERRIDE; | 298 virtual const wchar_t* GetResourceDllName() OVERRIDE; |
292 virtual void PreSpawnRenderer(sandbox::TargetPolicy* policy, | 299 virtual void PreSpawnRenderer(sandbox::TargetPolicy* policy, |
293 bool* success) OVERRIDE; | 300 bool* success) OVERRIDE; |
294 #endif | 301 #endif |
295 | 302 |
296 private: | 303 private: |
304 void UseContentSettingPermissionHelper(Profile* web_contents, | |
Michael van Ouwerkerk
2014/07/01 11:02:23
s/web_contents/profile/
Daniel Nishi
2014/07/01 18:37:48
"Helper" is gone now, so effectively done.
| |
305 const GURL& primary_url, | |
306 const GURL& secondary_url, | |
307 const std::string& setting_type); | |
308 | |
297 #if defined(ENABLE_WEBRTC) | 309 #if defined(ENABLE_WEBRTC) |
298 // Copies disable WebRTC encryption switch depending on the channel. | 310 // Copies disable WebRTC encryption switch depending on the channel. |
299 static void MaybeCopyDisableWebRtcEncryptionSwitch( | 311 static void MaybeCopyDisableWebRtcEncryptionSwitch( |
300 base::CommandLine* to_command_line, | 312 base::CommandLine* to_command_line, |
301 const base::CommandLine& from_command_line, | 313 const base::CommandLine& from_command_line, |
302 VersionInfo::Channel channel); | 314 VersionInfo::Channel channel); |
303 #endif | 315 #endif |
304 | 316 |
305 #if defined(ENABLE_PLUGINS) | 317 #if defined(ENABLE_PLUGINS) |
306 // Set of origins that can use TCP/UDP private APIs from NaCl. | 318 // Set of origins that can use TCP/UDP private APIs from NaCl. |
(...skipping 16 matching lines...) Expand all Loading... | |
323 prerender::PrerenderTracker* prerender_tracker_; | 335 prerender::PrerenderTracker* prerender_tracker_; |
324 | 336 |
325 friend class DisableWebRtcEncryptionFlagTest; | 337 friend class DisableWebRtcEncryptionFlagTest; |
326 | 338 |
327 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient); | 339 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient); |
328 }; | 340 }; |
329 | 341 |
330 } // namespace chrome | 342 } // namespace chrome |
331 | 343 |
332 #endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ | 344 #endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ |
OLD | NEW |