Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(443)

Side by Side Diff: chrome/browser/chrome_content_browser_client.cc

Issue 10541019: Adding a field trial for testing --force-compositing-mode on 50% of (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/browser/chrome_browser_main.cc ('k') | chrome/browser/gpu_util.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 19 matching lines...) Expand all
30 #include "chrome/browser/extensions/extension_host.h" 30 #include "chrome/browser/extensions/extension_host.h"
31 #include "chrome/browser/extensions/extension_info_map.h" 31 #include "chrome/browser/extensions/extension_info_map.h"
32 #include "chrome/browser/extensions/extension_message_handler.h" 32 #include "chrome/browser/extensions/extension_message_handler.h"
33 #include "chrome/browser/extensions/extension_process_manager.h" 33 #include "chrome/browser/extensions/extension_process_manager.h"
34 #include "chrome/browser/extensions/extension_service.h" 34 #include "chrome/browser/extensions/extension_service.h"
35 #include "chrome/browser/extensions/extension_system.h" 35 #include "chrome/browser/extensions/extension_system.h"
36 #include "chrome/browser/extensions/extension_web_ui.h" 36 #include "chrome/browser/extensions/extension_web_ui.h"
37 #include "chrome/browser/extensions/extension_webkit_preferences.h" 37 #include "chrome/browser/extensions/extension_webkit_preferences.h"
38 #include "chrome/browser/geolocation/chrome_access_token_store.h" 38 #include "chrome/browser/geolocation/chrome_access_token_store.h"
39 #include "chrome/browser/google/google_util.h" 39 #include "chrome/browser/google/google_util.h"
40 #include "chrome/browser/gpu_util.h"
40 #include "chrome/browser/infobars/infobar_tab_helper.h" 41 #include "chrome/browser/infobars/infobar_tab_helper.h"
41 #include "chrome/browser/media/media_internals.h" 42 #include "chrome/browser/media/media_internals.h"
42 #include "chrome/browser/net/chrome_net_log.h" 43 #include "chrome/browser/net/chrome_net_log.h"
43 #include "chrome/browser/notifications/desktop_notification_service.h" 44 #include "chrome/browser/notifications/desktop_notification_service.h"
44 #include "chrome/browser/notifications/desktop_notification_service_factory.h" 45 #include "chrome/browser/notifications/desktop_notification_service_factory.h"
45 #include "chrome/browser/pepper_gtalk_message_filter.h" 46 #include "chrome/browser/pepper_gtalk_message_filter.h"
46 #include "chrome/browser/platform_util.h" 47 #include "chrome/browser/platform_util.h"
47 #include "chrome/browser/prefs/pref_service.h" 48 #include "chrome/browser/prefs/pref_service.h"
48 #include "chrome/browser/prefs/scoped_user_pref_update.h" 49 #include "chrome/browser/prefs/scoped_user_pref_update.h"
49 #include "chrome/browser/prerender/prerender_manager.h" 50 #include "chrome/browser/prerender/prerender_manager.h"
(...skipping 1391 matching lines...) Expand 10 before | Expand all | Expand 10 after
1441 WebContents* web_contents = WebContents::FromRenderViewHost(rvh); 1442 WebContents* web_contents = WebContents::FromRenderViewHost(rvh);
1442 chrome::ViewType view_type = chrome::GetViewType(web_contents); 1443 chrome::ViewType view_type = chrome::GetViewType(web_contents);
1443 ExtensionService* service = profile->GetExtensionService(); 1444 ExtensionService* service = profile->GetExtensionService();
1444 if (service) { 1445 if (service) {
1445 const Extension* extension = service->extensions()->GetByID( 1446 const Extension* extension = service->extensions()->GetByID(
1446 rvh->GetSiteInstance()->GetSite().host()); 1447 rvh->GetSiteInstance()->GetSite().host());
1447 extension_webkit_preferences::SetPreferences( 1448 extension_webkit_preferences::SetPreferences(
1448 extension, view_type, web_prefs); 1449 extension, view_type, web_prefs);
1449 } 1450 }
1450 1451
1452 if (gpu_util::InForceCompositingModeTrial())
1453 web_prefs->force_compositing_mode = true;
1454
1451 if (view_type == chrome::VIEW_TYPE_NOTIFICATION) { 1455 if (view_type == chrome::VIEW_TYPE_NOTIFICATION) {
1452 web_prefs->allow_scripts_to_close_windows = true; 1456 web_prefs->allow_scripts_to_close_windows = true;
1453 } else if (view_type == chrome::VIEW_TYPE_BACKGROUND_CONTENTS) { 1457 } else if (view_type == chrome::VIEW_TYPE_BACKGROUND_CONTENTS) {
1454 // Disable all kinds of acceleration for background pages. 1458 // Disable all kinds of acceleration for background pages.
1455 // See http://crbug.com/96005 and http://crbug.com/96006 1459 // See http://crbug.com/96005 and http://crbug.com/96006
1456 web_prefs->force_compositing_mode = false; 1460 web_prefs->force_compositing_mode = false;
1457 web_prefs->accelerated_compositing_enabled = false; 1461 web_prefs->accelerated_compositing_enabled = false;
1458 web_prefs->accelerated_2d_canvas_enabled = false; 1462 web_prefs->accelerated_2d_canvas_enabled = false;
1459 web_prefs->accelerated_video_enabled = false; 1463 web_prefs->accelerated_video_enabled = false;
1460 web_prefs->accelerated_painting_enabled = false; 1464 web_prefs->accelerated_painting_enabled = false;
(...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after
1619 #if defined(USE_NSS) 1623 #if defined(USE_NSS)
1620 crypto::CryptoModuleBlockingPasswordDelegate* 1624 crypto::CryptoModuleBlockingPasswordDelegate*
1621 ChromeContentBrowserClient::GetCryptoPasswordDelegate( 1625 ChromeContentBrowserClient::GetCryptoPasswordDelegate(
1622 const GURL& url) { 1626 const GURL& url) {
1623 return browser::NewCryptoModuleBlockingDialogDelegate( 1627 return browser::NewCryptoModuleBlockingDialogDelegate(
1624 browser::kCryptoModulePasswordKeygen, url.host()); 1628 browser::kCryptoModulePasswordKeygen, url.host());
1625 } 1629 }
1626 #endif 1630 #endif
1627 1631
1628 } // namespace chrome 1632 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/chrome_browser_main.cc ('k') | chrome/browser/gpu_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698