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

Unified Diff: chrome/browser/tab_contents/render_view_context_menu.cc

Issue 9838050: Remove per-tab preference machinery. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: should be kWebKitGlobalJavascriptEnabled Created 8 years, 9 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/prefs/pref_service.cc ('k') | chrome/browser/ui/prefs/prefs_tab_helper.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/tab_contents/render_view_context_menu.cc
diff --git a/chrome/browser/tab_contents/render_view_context_menu.cc b/chrome/browser/tab_contents/render_view_context_menu.cc
index a7e4f97f79fd8b1bbd9efac9853808341eaec6ef..3ddbad48333ae2888fe2afb0294d39b7f0db9e6a 100644
--- a/chrome/browser/tab_contents/render_view_context_menu.cc
+++ b/chrome/browser/tab_contents/render_view_context_menu.cc
@@ -49,7 +49,6 @@
#include "chrome/browser/translate/translate_prefs.h"
#include "chrome/browser/translate/translate_tab_helper.h"
#include "chrome/browser/ui/browser.h"
-#include "chrome/browser/ui/prefs/prefs_tab_helper.h"
#include "chrome/browser/ui/search_engines/search_engine_tab_helper.h"
#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
#include "chrome/common/chrome_constants.h"
@@ -1905,14 +1904,9 @@ bool RenderViewContextMenu::IsDevCommandEnabled(int id) const {
// always enabled.
const Extension* extension = GetExtension();
if (!extension) {
- TabContentsWrapper* contents_wrapper =
- TabContentsWrapper::GetCurrentWrapperForContents(
- source_web_contents_);
- if (!contents_wrapper)
- return false;
const CommandLine* command_line = CommandLine::ForCurrentProcess();
- if (!contents_wrapper->prefs_tab_helper()->per_tab_prefs()->GetBoolean(
- prefs::kWebKitJavascriptEnabled) ||
+ if (!profile_->GetPrefs()->GetBoolean(
+ prefs::kWebKitGlobalJavascriptEnabled) ||
command_line->HasSwitch(switches::kDisableJavaScript))
return false;
#if defined(OS_MACOSX)
« no previous file with comments | « chrome/browser/prefs/pref_service.cc ('k') | chrome/browser/ui/prefs/prefs_tab_helper.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698