| 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 "chrome/browser/chrome_content_browser_client.h" | 5 #include "chrome/browser/chrome_content_browser_client.h" |
| 6 | 6 |
| 7 #include <set> | 7 #include <set> |
| 8 #include <utility> | 8 #include <utility> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 192 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 203 #endif | 203 #endif |
| 204 | 204 |
| 205 #if defined(ENABLE_WEBRTC) | 205 #if defined(ENABLE_WEBRTC) |
| 206 #include "chrome/browser/media/webrtc_logging_handler_host.h" | 206 #include "chrome/browser/media/webrtc_logging_handler_host.h" |
| 207 #endif | 207 #endif |
| 208 | 208 |
| 209 #if defined(ENABLE_INPUT_SPEECH) | 209 #if defined(ENABLE_INPUT_SPEECH) |
| 210 #include "chrome/browser/speech/chrome_speech_recognition_manager_delegate_bubbl
e_ui.h" | 210 #include "chrome/browser/speech/chrome_speech_recognition_manager_delegate_bubbl
e_ui.h" |
| 211 #endif | 211 #endif |
| 212 | 212 |
| 213 #if defined(FILE_MANAGER_EXTENSION) | 213 #if defined(OS_CHROMEOS) |
| 214 #include "chrome/browser/chromeos/file_manager/app_id.h" | 214 #include "chrome/browser/chromeos/file_manager/app_id.h" |
| 215 #endif | 215 #endif |
| 216 | 216 |
| 217 #if defined(TOOLKIT_GTK) | 217 #if defined(TOOLKIT_GTK) |
| 218 #include "chrome/browser/ui/gtk/chrome_browser_main_extra_parts_gtk.h" | 218 #include "chrome/browser/ui/gtk/chrome_browser_main_extra_parts_gtk.h" |
| 219 #endif | 219 #endif |
| 220 | 220 |
| 221 #if defined(TOOLKIT_VIEWS) | 221 #if defined(TOOLKIT_VIEWS) |
| 222 #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views.h" | 222 #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views.h" |
| 223 #endif | 223 #endif |
| (...skipping 2083 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2307 | 2307 |
| 2308 if (view_type == extensions::VIEW_TYPE_NOTIFICATION) { | 2308 if (view_type == extensions::VIEW_TYPE_NOTIFICATION) { |
| 2309 web_prefs->allow_scripts_to_close_windows = true; | 2309 web_prefs->allow_scripts_to_close_windows = true; |
| 2310 } else if (view_type == extensions::VIEW_TYPE_BACKGROUND_CONTENTS) { | 2310 } else if (view_type == extensions::VIEW_TYPE_BACKGROUND_CONTENTS) { |
| 2311 // Disable all kinds of acceleration for background pages. | 2311 // Disable all kinds of acceleration for background pages. |
| 2312 // See http://crbug.com/96005 and http://crbug.com/96006 | 2312 // See http://crbug.com/96005 and http://crbug.com/96006 |
| 2313 web_prefs->force_compositing_mode = false; | 2313 web_prefs->force_compositing_mode = false; |
| 2314 web_prefs->accelerated_compositing_enabled = false; | 2314 web_prefs->accelerated_compositing_enabled = false; |
| 2315 } | 2315 } |
| 2316 | 2316 |
| 2317 #if defined(FILE_MANAGER_EXTENSION) | 2317 #if defined(OS_CHROMEOS) |
| 2318 // Override the default of suppressing HW compositing for WebUI pages for the | 2318 // Override the default of suppressing HW compositing for WebUI pages for the |
| 2319 // file manager, which is implemented using WebUI but wants HW acceleration | 2319 // file manager, which is implemented using WebUI but wants HW acceleration |
| 2320 // for video decode & render. | 2320 // for video decode & render. |
| 2321 if (url.SchemeIs(extensions::kExtensionScheme) && | 2321 if (url.SchemeIs(extensions::kExtensionScheme) && |
| 2322 url.host() == file_manager::kFileManagerAppId) { | 2322 url.host() == file_manager::kFileManagerAppId) { |
| 2323 web_prefs->accelerated_compositing_enabled = true; | 2323 web_prefs->accelerated_compositing_enabled = true; |
| 2324 web_prefs->accelerated_2d_canvas_enabled = true; | 2324 web_prefs->accelerated_2d_canvas_enabled = true; |
| 2325 } | 2325 } |
| 2326 #endif | 2326 #endif |
| 2327 } | 2327 } |
| (...skipping 337 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2665 // releases of Chrome. Permitting "Unknown" allows these APIs to be used on | 2665 // releases of Chrome. Permitting "Unknown" allows these APIs to be used on |
| 2666 // Chromium builds as well. | 2666 // Chromium builds as well. |
| 2667 return channel <= chrome::VersionInfo::CHANNEL_DEV; | 2667 return channel <= chrome::VersionInfo::CHANNEL_DEV; |
| 2668 #else | 2668 #else |
| 2669 return false; | 2669 return false; |
| 2670 #endif | 2670 #endif |
| 2671 } | 2671 } |
| 2672 | 2672 |
| 2673 | 2673 |
| 2674 } // namespace chrome | 2674 } // namespace chrome |
| OLD | NEW |