diff options
author | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-14 03:00:31 +0000 |
---|---|---|
committer | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-14 03:00:31 +0000 |
commit | 84fd34f492ca3d1dc47ee8d43e0f011cefa63ac8 (patch) | |
tree | 0ec9b7ba3e2336b5f1334b7bc01308a3067e37ae | |
parent | 4d3040f46e09714e92a155039b85ab7f089900cf (diff) | |
download | chromium_src-84fd34f492ca3d1dc47ee8d43e0f011cefa63ac8.zip chromium_src-84fd34f492ca3d1dc47ee8d43e0f011cefa63ac8.tar.gz chromium_src-84fd34f492ca3d1dc47ee8d43e0f011cefa63ac8.tar.bz2 |
Try removing the --enable-user-stylesheet flag.
This is a test run to see how it impacts startup perf (if any).
BUG=38182
TBR=chase
Review URL: http://codereview.chromium.org/1595027
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@44443 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r-- | chrome/browser/tab_contents/render_view_host_delegate_helper.cc | 8 | ||||
-rw-r--r-- | chrome/common/chrome_switches.cc | 3 | ||||
-rw-r--r-- | chrome/common/chrome_switches.h | 1 |
3 files changed, 2 insertions, 10 deletions
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 977674d..79b2fa1 100644 --- a/chrome/browser/tab_contents/render_view_host_delegate_helper.cc +++ b/chrome/browser/tab_contents/render_view_host_delegate_helper.cc @@ -193,13 +193,9 @@ WebPreferences RenderViewHostDelegateHelper::GetWebkitPrefs( command_line.HasSwitch(switches::kAllowFileAccessFromFiles); web_prefs.show_composited_layer_borders = command_line.HasSwitch(switches::kShowCompositedLayerBorders); - web_prefs.user_style_sheet_enabled = - command_line.HasSwitch(switches::kEnableUserStyleSheet); - if (web_prefs.user_style_sheet_enabled) { - web_prefs.user_style_sheet_location = + web_prefs.user_style_sheet_enabled = true; + web_prefs.user_style_sheet_location = profile->GetUserStyleSheetWatcher()->user_style_sheet(); - } - } web_prefs.uses_universal_detector = diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc index 260df1b..8e95e65 100644 --- a/chrome/common/chrome_switches.cc +++ b/chrome/common/chrome_switches.cc @@ -316,9 +316,6 @@ const char kEnableSyncTypedUrls[] = "enable-sync-typed-urls"; // enabled or not. const char kEnableUserDataDirProfiles[] = "enable-udd-profiles"; -// Enable user style sheet (read from User Style Sheet in the profile dir). -const char kEnableUserStyleSheet[] = "enable-user-stylesheet"; - // Enables the option to show tabs as a vertical stack down the side of the // browser window. const char kEnableVerticalTabs[] = "enable-vertical-tabs"; diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h index 3b541b9..e2383ca 100644 --- a/chrome/common/chrome_switches.h +++ b/chrome/common/chrome_switches.h @@ -106,7 +106,6 @@ extern const char kEnableSyncPreferences[]; extern const char kEnableSyncThemes[]; extern const char kEnableSyncTypedUrls[]; extern const char kEnableUserDataDirProfiles[]; -extern const char kEnableUserStyleSheet[]; extern const char kEnableVerticalTabs[]; extern const char kEnableVideoLayering[]; extern const char kEnableVideoLogging[]; |