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

Unified Diff: chrome/browser/chrome_content_browser_client.cc

Issue 64843004: Get rid of user-level styles. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge to ToT Created 7 years, 1 month 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 | « no previous file | chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chrome_content_browser_client.cc
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index f12cd1ed5c9a7113bae3df4ecb46f57101d08602..a1ce5ba711e61416a13d69371e59d419a9e04c0d 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -86,8 +86,6 @@
#include "chrome/browser/ui/sync/sync_promo_ui.h"
#include "chrome/browser/ui/tab_contents/chrome_web_contents_view_delegate.h"
#include "chrome/browser/ui/webui/chrome_web_ui_controller_factory.h"
-#include "chrome/browser/user_style_sheet_watcher.h"
-#include "chrome/browser/user_style_sheet_watcher_factory.h"
#include "chrome/browser/validation_message_message_filter.h"
#include "chrome/common/chrome_constants.h"
#include "chrome/common/chrome_paths.h"
@@ -2250,21 +2248,6 @@ void ChromeContentBrowserClient::OverrideWebkitPrefs(
web_prefs->password_echo_enabled = browser_defaults::kPasswordEchoEnabled;
#endif
-#if defined(OS_ANDROID)
- web_prefs->user_style_sheet_enabled = false;
-#else
- // The user stylesheet watcher may not exist in a testing profile.
- UserStyleSheetWatcher* user_style_sheet_watcher =
- UserStyleSheetWatcherFactory::GetForProfile(profile).get();
- if (user_style_sheet_watcher) {
- web_prefs->user_style_sheet_enabled = true;
- web_prefs->user_style_sheet_location =
- user_style_sheet_watcher->user_style_sheet();
- } else {
- web_prefs->user_style_sheet_enabled = false;
- }
-#endif
-
web_prefs->asynchronous_spell_checking_enabled = true;
web_prefs->unified_textchecker_enabled = true;
« no previous file with comments | « no previous file | chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698