Add per-tab "JavaScript enabled" preference.

chrome/browser/ui/tab_contents/tab_contents_wrapper.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 
 #include "base/utf_string_conversions.h"
 
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
@@ skipping 31 matching lines @@
 #include "chrome/browser/themes/theme_service_factory.h"
 #include "chrome/browser/translate/translate_tab_helper.h"
 #include "chrome/browser/ui/blocked_content/blocked_content_tab_helper.h"
 #include "chrome/browser/ui/bookmarks/bookmark_tab_helper.h"
 #include "chrome/browser/ui/constrained_window_tab_helper.h"
 #include "chrome/browser/ui/find_bar/find_tab_helper.h"
 #include "chrome/browser/ui/intents/web_intent_picker_factory_impl.h"
 #include "chrome/browser/ui/intents/web_intent_picker_controller.h"
 #include "chrome/browser/ui/sad_tab_observer.h"
 #include "chrome/browser/ui/search_engines/search_engine_tab_helper.h"
+#include "chrome/browser/ui/tab_contents/per_tab_prefs_tab_helper.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper_delegate.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/render_messages.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/tab_contents/tab_contents_view.h"
 #include "content/public/browser/notification_service.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
@@ skipping 15 matching lines @@
 #if defined (ENABLE_SAFE_BROWSING)
   prefs::kSafeBrowsingEnabled,
 #endif
   prefs::kWebKitAllowDisplayingInsecureContent,
   prefs::kWebKitAllowRunningInsecureContent,
   prefs::kWebKitCursiveFontFamily,
   prefs::kWebKitDefaultFixedFontSize,
   prefs::kWebKitDefaultFontSize,
   prefs::kWebKitFantasyFontFamily,
   prefs::kWebKitFixedFontFamily,
+  prefs::kWebKitGlobalJavascriptEnabled,
   prefs::kWebKitJavaEnabled,
-  prefs::kWebKitJavascriptEnabled,
   prefs::kWebKitLoadsImagesAutomatically,
   prefs::kWebKitMinimumFontSize,
   prefs::kWebKitMinimumLogicalFontSize,
   prefs::kWebKitPluginsEnabled,
   prefs::kWebKitSansSerifFontFamily,
   prefs::kWebKitSerifFontFamily,
   prefs::kWebKitStandardFontFamily,
   prefs::kWebkitTabsToLinks,
   prefs::kWebKitUsesUniversalDetector
 };
@@ skipping 176 matching lines @@
   bookmark_tab_helper_.reset(new BookmarkTabHelper(this));
   constrained_window_tab_helper_.reset(new ConstrainedWindowTabHelper(this));
   extension_tab_helper_.reset(new ExtensionTabHelper(this));
   favicon_tab_helper_.reset(new FaviconTabHelper(contents));
   find_tab_helper_.reset(new FindTabHelper(contents));
   history_tab_helper_.reset(new HistoryTabHelper(contents));
   infobar_tab_helper_.reset(new InfoBarTabHelper(contents));
   password_manager_delegate_.reset(new PasswordManagerDelegateImpl(this));
   password_manager_.reset(
       new PasswordManager(contents, password_manager_delegate_.get()));
+  per_tab_prefs_tab_helper_.reset(new PerTabPrefsTabHelper(this));
   prerender_tab_helper_.reset(new prerender::PrerenderTabHelper(this));
   print_view_manager_.reset(new printing::PrintViewManager(this));
   restore_tab_helper_.reset(new RestoreTabHelper(this));
 #if defined(ENABLE_SAFE_BROWSING)
   if (profile()->GetPrefs()->GetBoolean(prefs::kSafeBrowsingEnabled) &&
       g_browser_process->safe_browsing_detection_service()) {
     safebrowsing_detection_host_.reset(
         safe_browsing::ClientSideDetectionHost::Create(contents));
   }
 #endif
   search_engine_tab_helper_.reset(new SearchEngineTabHelper(contents));
   ssl_helper_.reset(new TabContentsSSLHelper(this));
   content_settings_.reset(new TabSpecificContentSettings(contents));
   translate_tab_helper_.reset(new TranslateTabHelper(contents));
   web_intent_picker_controller_.reset(new WebIntentPickerController(
       this, new WebIntentPickerFactoryImpl()));
 
   // Create the per-tab observers.
   download_request_limiter_observer_.reset(
       new DownloadRequestLimiterObserver(contents));
   webnavigation_observer_.reset(
       new ExtensionWebNavigationTabObserver(contents));
   external_protocol_observer_.reset(new ExternalProtocolObserver(contents));
   plugin_observer_.reset(new PluginObserver(this));
-  per_tab_prefs_.reset(
-      profile()->GetPrefs()->CreatePrefServiceWithPerTabPrefStore());
   print_preview_.reset(new printing::PrintPreviewMessageHandler(contents));
   sad_tab_observer_.reset(new SadTabObserver(contents));
   // Start the in-browser thumbnailing if the feature is enabled.
   if (switches::IsInBrowserThumbnailingEnabled()) {
     thumbnail_generation_observer_.reset(new ThumbnailGenerator);
     thumbnail_generation_observer_->StartThumbnailing(tab_contents_.get());
   }
 
   // Set-up the showing of the omnibox search infobar if applicable.
   if (OmniboxSearchHint::IsEnabled(profile()))
@@ skipping 46 matching lines @@
   return g_tab_contents_wrapper_property_accessor.Pointer();
 }
 
 // static
 void TabContentsWrapper::RegisterUserPrefs(PrefService* prefs) {
   prefs->RegisterBooleanPref(prefs::kAlternateErrorPagesEnabled,
                              true,
                              PrefService::SYNCABLE_PREF);
 
   WebPreferences pref_defaults;
-  prefs->RegisterBooleanPref(prefs::kWebKitJavascriptEnabled,
+  prefs->RegisterBooleanPref(prefs::kWebKitGlobalJavascriptEnabled,
                              pref_defaults.javascript_enabled,
                              PrefService::UNSYNCABLE_PREF);
   prefs->RegisterBooleanPref(prefs::kWebKitWebSecurityEnabled,
                              pref_defaults.web_security_enabled,
                              PrefService::UNSYNCABLE_PREF);
   prefs->RegisterBooleanPref(
       prefs::kWebKitJavascriptCanOpenWindowsAutomatically,
       true,
       PrefService::UNSYNCABLE_PREF);
   prefs->RegisterBooleanPref(prefs::kWebKitLoadsImagesAutomatically,
@@ skipping 237 matching lines @@
       break;
 #if defined(OS_POSIX) && !defined(OS_MACOSX)
     case chrome::NOTIFICATION_BROWSER_THEME_CHANGED: {
       UpdateRendererPreferences();
       break;
     }
 #endif
     case chrome::NOTIFICATION_PREF_CHANGED: {
       std::string* pref_name_in = content::Details<std::string>(details).ptr();
       DCHECK(content::Source<PrefService>(source).ptr() ==
-             profile()->GetPrefs());
+             profile()->GetPrefs() ||
+             content::Source<PrefService>(source).ptr() ==
+             per_tab_prefs_tab_helper_->prefs());
       if (*pref_name_in == prefs::kAlternateErrorPagesEnabled) {
         UpdateAlternateErrorPageURL(render_view_host());
       } else if ((*pref_name_in == prefs::kDefaultCharset) ||
                  StartsWithASCII(*pref_name_in, "webkit.webprefs.", true)) {
         UpdateWebPreferences();
       } else if (*pref_name_in == prefs::kDefaultZoomLevel) {
         tab_contents()->render_view_host()->SetZoomLevel(
             tab_contents()->GetZoomLevel());
       } else if (*pref_name_in == prefs::kEnableReferrers) {
         UpdateRendererPreferences();
@@ skipping 37 matching lines @@
   }
   return url;
 }
 
 void TabContentsWrapper::UpdateAlternateErrorPageURL(RenderViewHost* rvh) {
   rvh->SetAltErrorPageURL(GetAlternateErrorPageURL());
 }
 
 void TabContentsWrapper::UpdateWebPreferences() {
   RenderViewHostDelegate* rvhd = tab_contents();
-  tab_contents()->render_view_host()->UpdateWebkitPreferences(
-      rvhd->GetWebkitPrefs());
+  WebPreferences prefs = rvhd->GetWebkitPrefs();
+  per_tab_prefs_tab_helper_->OverrideWebPreferences(&prefs);
+  tab_contents()->render_view_host()->UpdateWebkitPreferences(prefs);
 }
 
 void TabContentsWrapper::UpdateRendererPreferences() {
   renderer_preferences_util::UpdateFromSystemSettings(
       tab_contents()->GetMutableRendererPrefs(), profile());
   render_view_host()->SyncRendererPrefs();
 }
 
 void TabContentsWrapper::UpdateSafebrowsingDetectionHost() {
 #if defined(ENABLE_SAFE_BROWSING)
@@ skipping 11 matching lines @@
   render_view_host()->Send(
       new ChromeViewMsg_SetClientSidePhishingDetection(routing_id(),
                                                        safe_browsing));
 #endif
 }
 
 void TabContentsWrapper::ExitFullscreenMode() {
   if (tab_contents() && render_view_host())
     tab_contents()->render_view_host()->ExitFullscreen();
 }