diff options
| author | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-14 07:45:48 +0000 |
|---|---|---|
| committer | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-14 07:45:48 +0000 |
| commit | b070d6041bd865e649befc4e8d2239c60a4a46c4 (patch) | |
| tree | 5c58d21e66df5a737d99a8237000474c36b49e2c /chrome/browser/tab_contents | |
| parent | ff4372068e5f1f123a97453925942823db4ffddb (diff) | |
| download | chromium_src-b070d6041bd865e649befc4e8d2239c60a4a46c4.zip chromium_src-b070d6041bd865e649befc4e8d2239c60a4a46c4.tar.gz chromium_src-b070d6041bd865e649befc4e8d2239c60a4a46c4.tar.bz2 | |
Remove the --enable-user-stylesheet flag.
Startup perf was not impacted in an earlier test run, so this should be safe.
BUG=38182
Review URL: http://codereview.chromium.org/1530031
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@44457 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/tab_contents')
| -rw-r--r-- | chrome/browser/tab_contents/render_view_host_delegate_helper.cc | 9 |
1 files changed, 5 insertions, 4 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..e8591fd 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,14 @@ 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) { + // The user stylesheet watcher may not exist in a testing profile. + if (profile->GetUserStyleSheetWatcher()) { + web_prefs.user_style_sheet_enabled = true; web_prefs.user_style_sheet_location = profile->GetUserStyleSheetWatcher()->user_style_sheet(); + } else { + web_prefs.user_style_sheet_enabled = false; } - } web_prefs.uses_universal_detector = |