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

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

Issue 10409088: Get rid of the RenderViewType concept in content, since it was only used by Chrome. Store the enum… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 years, 7 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
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 1429 matching lines...) Expand 10 before | Expand all | Expand 10 after
1440 // Make sure we will set the default_encoding with canonical encoding name. 1440 // Make sure we will set the default_encoding with canonical encoding name.
1441 web_prefs->default_encoding = 1441 web_prefs->default_encoding =
1442 CharacterEncoding::GetCanonicalEncodingNameByAliasName( 1442 CharacterEncoding::GetCanonicalEncodingNameByAliasName(
1443 web_prefs->default_encoding); 1443 web_prefs->default_encoding);
1444 if (web_prefs->default_encoding.empty()) { 1444 if (web_prefs->default_encoding.empty()) {
1445 prefs->ClearPref(prefs::kDefaultCharset); 1445 prefs->ClearPref(prefs::kDefaultCharset);
1446 web_prefs->default_encoding = prefs->GetString(prefs::kDefaultCharset); 1446 web_prefs->default_encoding = prefs->GetString(prefs::kDefaultCharset);
1447 } 1447 }
1448 DCHECK(!web_prefs->default_encoding.empty()); 1448 DCHECK(!web_prefs->default_encoding.empty());
1449 1449
1450 WebContents* web_contents = WebContents::FromRenderViewHost(rvh);
1451 chrome::ViewType view_type = chrome::GetViewType(web_contents);
1450 ExtensionService* service = profile->GetExtensionService(); 1452 ExtensionService* service = profile->GetExtensionService();
1451 if (service) { 1453 if (service) {
1452 const Extension* extension = service->extensions()->GetByID( 1454 const Extension* extension = service->extensions()->GetByID(
1453 rvh->GetSiteInstance()->GetSite().host()); 1455 rvh->GetSiteInstance()->GetSite().host());
1454 extension_webkit_preferences::SetPreferences( 1456 extension_webkit_preferences::SetPreferences(
1455 extension, rvh->GetDelegate()->GetRenderViewType(), web_prefs); 1457 extension, view_type, web_prefs);
1456 } 1458 }
1457 1459
1458 if (rvh->GetDelegate()->GetRenderViewType() == 1460 if (view_type == chrome::VIEW_TYPE_NOTIFICATION) {
1459 chrome::VIEW_TYPE_NOTIFICATION) {
1460 web_prefs->allow_scripts_to_close_windows = true; 1461 web_prefs->allow_scripts_to_close_windows = true;
1461 } else if (rvh->GetDelegate()->GetRenderViewType() == 1462 } else if (view_type == chrome::VIEW_TYPE_BACKGROUND_CONTENTS) {
1462 chrome::VIEW_TYPE_BACKGROUND_CONTENTS) {
1463 // Disable all kinds of acceleration for background pages. 1463 // Disable all kinds of acceleration for background pages.
1464 // See http://crbug.com/96005 and http://crbug.com/96006 1464 // See http://crbug.com/96005 and http://crbug.com/96006
1465 web_prefs->force_compositing_mode = false; 1465 web_prefs->force_compositing_mode = false;
1466 web_prefs->accelerated_compositing_enabled = false; 1466 web_prefs->accelerated_compositing_enabled = false;
1467 web_prefs->accelerated_2d_canvas_enabled = false; 1467 web_prefs->accelerated_2d_canvas_enabled = false;
1468 web_prefs->accelerated_video_enabled = false; 1468 web_prefs->accelerated_video_enabled = false;
1469 web_prefs->accelerated_painting_enabled = false; 1469 web_prefs->accelerated_painting_enabled = false;
1470 web_prefs->accelerated_plugins_enabled = false; 1470 web_prefs->accelerated_plugins_enabled = false;
1471 } 1471 }
1472 1472
(...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after
1627 #if defined(USE_NSS) 1627 #if defined(USE_NSS)
1628 crypto::CryptoModuleBlockingPasswordDelegate* 1628 crypto::CryptoModuleBlockingPasswordDelegate*
1629 ChromeContentBrowserClient::GetCryptoPasswordDelegate( 1629 ChromeContentBrowserClient::GetCryptoPasswordDelegate(
1630 const GURL& url) { 1630 const GURL& url) {
1631 return browser::NewCryptoModuleBlockingDialogDelegate( 1631 return browser::NewCryptoModuleBlockingDialogDelegate(
1632 browser::kCryptoModulePasswordKeygen, url.host()); 1632 browser::kCryptoModulePasswordKeygen, url.host());
1633 } 1633 }
1634 #endif 1634 #endif
1635 1635
1636 } // namespace chrome 1636 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698