summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwangxianzhu <wangxianzhu@chromium.org>2015-04-30 10:02:06 -0700
committerCommit bot <commit-bot@chromium.org>2015-04-30 17:02:47 +0000
commit2c068d932eebc43780432ae7e58bf487d2f180d9 (patch)
treef5384331cd610f6dc91992c94121dd57c6950d4e
parent48944a7383fc9ca47260181fc9f8ffbc999cf5e2 (diff)
downloadchromium_src-2c068d932eebc43780432ae7e58bf487d2f180d9.zip
chromium_src-2c068d932eebc43780432ae7e58bf487d2f180d9.tar.gz
chromium_src-2c068d932eebc43780432ae7e58bf487d2f180d9.tar.bz2
Remove shrinkStandaloneImagesToFit pref/setting
Blink is now always shrinking image documents to fit, having different shrink-to-fit mode for viewport and desktop. The shrinkStandaloneImagesToFit pref/setting is no longer used. BUG=464295 Review URL: https://codereview.chromium.org/1116813002 Cr-Commit-Position: refs/heads/master@{#327726}
-rw-r--r--chrome/browser/chrome_content_browser_client.cc2
-rw-r--r--chrome/browser/ui/prefs/prefs_tab_helper.cc3
-rw-r--r--chrome/common/pref_names.cc2
-rw-r--r--chrome/common/pref_names.h1
-rw-r--r--content/renderer/render_view_impl.cc3
5 files changed, 0 insertions, 11 deletions
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index c6e59f5..a3a9b9d 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -1999,8 +1999,6 @@ void ChromeContentBrowserClient::OverrideWebkitPrefs(
prefs->GetBoolean(prefs::kWebKitJavascriptCanOpenWindowsAutomatically);
web_prefs->dom_paste_enabled =
prefs->GetBoolean(prefs::kWebKitDomPasteEnabled);
- web_prefs->shrinks_standalone_images_to_fit =
- prefs->GetBoolean(prefs::kWebKitShrinksStandaloneImagesToFit);
web_prefs->tabs_to_links = prefs->GetBoolean(prefs::kWebkitTabsToLinks);
if (!prefs->GetBoolean(prefs::kWebKitJavascriptEnabled))
diff --git a/chrome/browser/ui/prefs/prefs_tab_helper.cc b/chrome/browser/ui/prefs/prefs_tab_helper.cc
index a614dd9..670e36a 100644
--- a/chrome/browser/ui/prefs/prefs_tab_helper.cc
+++ b/chrome/browser/ui/prefs/prefs_tab_helper.cc
@@ -81,7 +81,6 @@ const char* kPrefsToObserve[] = {
prefs::kWebKitMinimumFontSize,
prefs::kWebKitMinimumLogicalFontSize,
prefs::kWebKitPluginsEnabled,
- prefs::kWebKitShrinksStandaloneImagesToFit,
prefs::kWebkitTabsToLinks,
prefs::kWebKitTextAreasAreResizable,
prefs::kWebKitUsesUniversalDetector,
@@ -531,8 +530,6 @@ void PrefsTabHelper::RegisterProfilePrefs(
pref_defaults.plugins_enabled);
registry->RegisterBooleanPref(prefs::kWebKitDomPasteEnabled,
pref_defaults.dom_paste_enabled);
- registry->RegisterBooleanPref(prefs::kWebKitShrinksStandaloneImagesToFit,
- pref_defaults.shrinks_standalone_images_to_fit);
registry->RegisterBooleanPref(prefs::kWebKitTextAreasAreResizable,
pref_defaults.text_areas_are_resizable);
registry->RegisterBooleanPref(prefs::kWebKitJavaEnabled,
diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc
index 0e93b1f..b68af2a 100644
--- a/chrome/common/pref_names.cc
+++ b/chrome/common/pref_names.cc
@@ -288,8 +288,6 @@ const char kWebKitSansSerifFontFamilyTraditionalHan[] =
// WebKit preferences.
const char kWebKitWebSecurityEnabled[] = "webkit.webprefs.web_security_enabled";
const char kWebKitDomPasteEnabled[] = "webkit.webprefs.dom_paste_enabled";
-const char kWebKitShrinksStandaloneImagesToFit[] =
- "webkit.webprefs.shrinks_standalone_images_to_fit";
const char kWebKitUsesUniversalDetector[] =
"webkit.webprefs.uses_universal_detector";
const char kWebKitTextAreasAreResizable[] =
diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h
index a6e36ba..97fd2f3 100644
--- a/chrome/common/pref_names.h
+++ b/chrome/common/pref_names.h
@@ -128,7 +128,6 @@ extern const char kWebKitJavascriptCanOpenWindowsAutomatically[];
extern const char kWebKitLoadsImagesAutomatically[];
extern const char kWebKitPluginsEnabled[];
extern const char kWebKitDomPasteEnabled[];
-extern const char kWebKitShrinksStandaloneImagesToFit[];
extern const char kWebKitUsesUniversalDetector[];
extern const char kWebKitTextAreasAreResizable[];
extern const char kWebKitJavaEnabled[];
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index eb997132..ae84e81 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -932,8 +932,6 @@ void RenderView::ApplyWebPreferences(const WebPreferences& prefs,
settings->setImagesEnabled(prefs.images_enabled);
settings->setPluginsEnabled(prefs.plugins_enabled);
settings->setDOMPasteAllowed(prefs.dom_paste_enabled);
- settings->setShrinksStandaloneImagesToFit(
- prefs.shrinks_standalone_images_to_fit);
settings->setUsesEncodingDetector(prefs.uses_universal_detector);
settings->setTextAreasAreResizable(prefs.text_areas_are_resizable);
settings->setAllowScriptsToCloseWindows(prefs.allow_scripts_to_close_windows);
@@ -1117,7 +1115,6 @@ void RenderView::ApplyWebPreferences(const WebPreferences& prefs,
: false;
settings->setMainFrameClipsContent(!record_full_layer);
- settings->setShrinksStandaloneImagesToFit(false);
settings->setShrinksViewportContentToFit(true);
settings->setUseMobileViewportStyle(true);
#endif