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 #include "content/public/browser/content_browser_client.h" | 5 #include "content/public/browser/content_browser_client.h" |
| 6 | 6 |
| 7 #include "base/files/file_path.h" | 7 #include "base/files/file_path.h" |
| 8 #include "ui/gfx/image/image_skia.h" | 8 #include "ui/gfx/image/image_skia.h" |
| 9 #include "url/gurl.h" | 9 #include "url/gurl.h" |
| 10 | 10 |
| (...skipping 214 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 225 void ContentBrowserClient::RequestMidiSysExPermission( | 225 void ContentBrowserClient::RequestMidiSysExPermission( |
| 226 WebContents* web_contents, | 226 WebContents* web_contents, |
| 227 int bridge_id, | 227 int bridge_id, |
| 228 const GURL& requesting_frame, | 228 const GURL& requesting_frame, |
| 229 bool user_gesture, | 229 bool user_gesture, |
| 230 base::Callback<void(bool)> result_callback, | 230 base::Callback<void(bool)> result_callback, |
| 231 base::Closure* cancel_callback) { | 231 base::Closure* cancel_callback) { |
| 232 result_callback.Run(true); | 232 result_callback.Run(true); |
| 233 } | 233 } |
| 234 | 234 |
| 235 void ContentBrowserClient::UseContentSettingPermission( | |
| 236 WebContents* web_contents, | |
| 237 const GURL& primary_url, | |
| 238 const GURL& secondary_url, | |
| 239 const std::string& setting_type) { | |
| 240 return; | |
|
Bernhard Bauer
2014/07/14 10:50:33
Return is unneccessary.
Daniel Nishi
2014/07/14 17:12:54
Done.
| |
| 241 } | |
| 242 | |
| 235 void ContentBrowserClient::RequestProtectedMediaIdentifierPermission( | 243 void ContentBrowserClient::RequestProtectedMediaIdentifierPermission( |
| 236 WebContents* web_contents, | 244 WebContents* web_contents, |
| 237 const GURL& origin, | 245 const GURL& origin, |
| 238 base::Callback<void(bool)> result_callback, | 246 base::Callback<void(bool)> result_callback, |
| 239 base::Closure* cancel_callback) { | 247 base::Closure* cancel_callback) { |
| 240 result_callback.Run(true); | 248 result_callback.Run(true); |
| 241 } | 249 } |
| 242 | 250 |
| 243 bool ContentBrowserClient::CanCreateWindow( | 251 bool ContentBrowserClient::CanCreateWindow( |
| 244 const GURL& opener_url, | 252 const GURL& opener_url, |
| (...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 344 | 352 |
| 345 #if defined(VIDEO_HOLE) | 353 #if defined(VIDEO_HOLE) |
| 346 ExternalVideoSurfaceContainer* | 354 ExternalVideoSurfaceContainer* |
| 347 ContentBrowserClient::OverrideCreateExternalVideoSurfaceContainer( | 355 ContentBrowserClient::OverrideCreateExternalVideoSurfaceContainer( |
| 348 WebContents* web_contents) { | 356 WebContents* web_contents) { |
| 349 return NULL; | 357 return NULL; |
| 350 } | 358 } |
| 351 #endif | 359 #endif |
| 352 | 360 |
| 353 } // namespace content | 361 } // namespace content |
| OLD | NEW |