diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-23 04:11:49 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-23 04:11:49 +0000 |
| commit | 8093382a5f49c50cdb6262329a30b14f3c241ee6 (patch) | |
| tree | edf116d3fed6e009e63d2fe7210bbf1ac7c127b8 /chrome/browser/tab_contents | |
| parent | 5b517c1363fd50549aebc94d5287fb0ebe791b95 (diff) | |
| download | chromium_src-8093382a5f49c50cdb6262329a30b14f3c241ee6.zip chromium_src-8093382a5f49c50cdb6262329a30b14f3c241ee6.tar.gz chromium_src-8093382a5f49c50cdb6262329a30b14f3c241ee6.tar.bz2 | |
WebUI: Fix the remaining references to dom_ui. Final Patch.
BUG=59945, 59946
TEST=trybots
Review URL: http://codereview.chromium.org/6555001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@75716 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/tab_contents')
3 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/tab_contents/background_contents.cc b/chrome/browser/tab_contents/background_contents.cc index 059d393..d5e113c 100644 --- a/chrome/browser/tab_contents/background_contents.cc +++ b/chrome/browser/tab_contents/background_contents.cc @@ -206,7 +206,7 @@ WebPreferences BackgroundContents::GetWebkitPrefs() { // apps. Profile* profile = render_view_host_->process()->profile(); return RenderViewHostDelegateHelper::GetWebkitPrefs(profile, - false); // is_dom_ui + false); // is_web_ui } void BackgroundContents::ProcessWebUIMessage( diff --git a/chrome/browser/tab_contents/render_view_host_delegate_helper.cc b/chrome/browser/tab_contents/render_view_host_delegate_helper.cc index 34cb45c..1acf625 100644 --- a/chrome/browser/tab_contents/render_view_host_delegate_helper.cc +++ b/chrome/browser/tab_contents/render_view_host_delegate_helper.cc @@ -193,7 +193,7 @@ bool RenderViewHostDelegateHelper::gpu_enabled_ = true; // static WebPreferences RenderViewHostDelegateHelper::GetWebkitPrefs( - Profile* profile, bool is_dom_ui) { + Profile* profile, bool is_web_ui) { PrefService* prefs = profile->GetPrefs(); WebPreferences web_prefs; @@ -332,7 +332,7 @@ WebPreferences RenderViewHostDelegateHelper::GetWebkitPrefs( } DCHECK(!web_prefs.default_encoding.empty()); - if (is_dom_ui) { + if (is_web_ui) { web_prefs.loads_images_automatically = true; web_prefs.javascript_enabled = true; } diff --git a/chrome/browser/tab_contents/render_view_host_delegate_helper.h b/chrome/browser/tab_contents/render_view_host_delegate_helper.h index 320a3d0..87594f4 100644 --- a/chrome/browser/tab_contents/render_view_host_delegate_helper.h +++ b/chrome/browser/tab_contents/render_view_host_delegate_helper.h @@ -95,7 +95,7 @@ class RenderViewHostDelegateViewHelper { // RenderViewHostDelegate methods. class RenderViewHostDelegateHelper { public: - static WebPreferences GetWebkitPrefs(Profile* profile, bool is_dom_ui); + static WebPreferences GetWebkitPrefs(Profile* profile, bool is_web_ui); static void UpdateInspectorSetting(Profile* profile, const std::string& key, |