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

Side by Side 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/chrome_content_browser_client.h" 5 #include "chrome/browser/chrome_content_browser_client.h"
6 6
7 #include <set> 7 #include <set>
8 #include <utility> 8 #include <utility>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 #include "chrome/browser/ssl/ssl_blocking_page.h" 79 #include "chrome/browser/ssl/ssl_blocking_page.h"
80 #include "chrome/browser/ssl/ssl_tab_helper.h" 80 #include "chrome/browser/ssl/ssl_tab_helper.h"
81 #include "chrome/browser/sync_file_system/local/sync_file_system_backend.h" 81 #include "chrome/browser/sync_file_system/local/sync_file_system_backend.h"
82 #include "chrome/browser/tab_contents/tab_util.h" 82 #include "chrome/browser/tab_contents/tab_util.h"
83 #include "chrome/browser/ui/blocked_content/blocked_window_params.h" 83 #include "chrome/browser/ui/blocked_content/blocked_window_params.h"
84 #include "chrome/browser/ui/blocked_content/popup_blocker_tab_helper.h" 84 #include "chrome/browser/ui/blocked_content/popup_blocker_tab_helper.h"
85 #include "chrome/browser/ui/chrome_select_file_policy.h" 85 #include "chrome/browser/ui/chrome_select_file_policy.h"
86 #include "chrome/browser/ui/sync/sync_promo_ui.h" 86 #include "chrome/browser/ui/sync/sync_promo_ui.h"
87 #include "chrome/browser/ui/tab_contents/chrome_web_contents_view_delegate.h" 87 #include "chrome/browser/ui/tab_contents/chrome_web_contents_view_delegate.h"
88 #include "chrome/browser/ui/webui/chrome_web_ui_controller_factory.h" 88 #include "chrome/browser/ui/webui/chrome_web_ui_controller_factory.h"
89 #include "chrome/browser/user_style_sheet_watcher.h"
90 #include "chrome/browser/user_style_sheet_watcher_factory.h"
91 #include "chrome/browser/validation_message_message_filter.h" 89 #include "chrome/browser/validation_message_message_filter.h"
92 #include "chrome/common/chrome_constants.h" 90 #include "chrome/common/chrome_constants.h"
93 #include "chrome/common/chrome_paths.h" 91 #include "chrome/common/chrome_paths.h"
94 #include "chrome/common/chrome_switches.h" 92 #include "chrome/common/chrome_switches.h"
95 #include "chrome/common/chrome_version_info.h" 93 #include "chrome/common/chrome_version_info.h"
96 #include "chrome/common/env_vars.h" 94 #include "chrome/common/env_vars.h"
97 #include "chrome/common/extensions/background_info.h" 95 #include "chrome/common/extensions/background_info.h"
98 #include "chrome/common/extensions/extension.h" 96 #include "chrome/common/extensions/extension.h"
99 #include "chrome/common/extensions/extension_process_policy.h" 97 #include "chrome/common/extensions/extension_process_policy.h"
100 #include "chrome/common/extensions/extension_set.h" 98 #include "chrome/common/extensions/extension_set.h"
(...skipping 2142 matching lines...) Expand 10 before | Expand all | Expand 10 after
2243 prefs->GetBoolean(prefs::kWebKitForceEnableZoom); 2241 prefs->GetBoolean(prefs::kWebKitForceEnableZoom);
2244 #endif 2242 #endif
2245 2243
2246 #if defined(OS_ANDROID) 2244 #if defined(OS_ANDROID)
2247 web_prefs->password_echo_enabled = 2245 web_prefs->password_echo_enabled =
2248 prefs->GetBoolean(prefs::kWebKitPasswordEchoEnabled); 2246 prefs->GetBoolean(prefs::kWebKitPasswordEchoEnabled);
2249 #else 2247 #else
2250 web_prefs->password_echo_enabled = browser_defaults::kPasswordEchoEnabled; 2248 web_prefs->password_echo_enabled = browser_defaults::kPasswordEchoEnabled;
2251 #endif 2249 #endif
2252 2250
2253 #if defined(OS_ANDROID)
2254 web_prefs->user_style_sheet_enabled = false;
2255 #else
2256 // The user stylesheet watcher may not exist in a testing profile.
2257 UserStyleSheetWatcher* user_style_sheet_watcher =
2258 UserStyleSheetWatcherFactory::GetForProfile(profile).get();
2259 if (user_style_sheet_watcher) {
2260 web_prefs->user_style_sheet_enabled = true;
2261 web_prefs->user_style_sheet_location =
2262 user_style_sheet_watcher->user_style_sheet();
2263 } else {
2264 web_prefs->user_style_sheet_enabled = false;
2265 }
2266 #endif
2267
2268 web_prefs->asynchronous_spell_checking_enabled = true; 2251 web_prefs->asynchronous_spell_checking_enabled = true;
2269 web_prefs->unified_textchecker_enabled = true; 2252 web_prefs->unified_textchecker_enabled = true;
2270 2253
2271 web_prefs->uses_universal_detector = 2254 web_prefs->uses_universal_detector =
2272 prefs->GetBoolean(prefs::kWebKitUsesUniversalDetector); 2255 prefs->GetBoolean(prefs::kWebKitUsesUniversalDetector);
2273 web_prefs->text_areas_are_resizable = 2256 web_prefs->text_areas_are_resizable =
2274 prefs->GetBoolean(prefs::kWebKitTextAreasAreResizable); 2257 prefs->GetBoolean(prefs::kWebKitTextAreasAreResizable);
2275 web_prefs->hyperlink_auditing_enabled = 2258 web_prefs->hyperlink_auditing_enabled =
2276 prefs->GetBoolean(prefs::kEnableHyperlinkAuditing); 2259 prefs->GetBoolean(prefs::kEnableHyperlinkAuditing);
2277 2260
(...skipping 365 matching lines...) Expand 10 before | Expand all | Expand 10 after
2643 return IsExtensionOrSharedModuleWhitelisted(url, extension_set, 2626 return IsExtensionOrSharedModuleWhitelisted(url, extension_set,
2644 allowed_file_handle_origins_) || 2627 allowed_file_handle_origins_) ||
2645 IsHostAllowedByCommandLine(url, extension_set, 2628 IsHostAllowedByCommandLine(url, extension_set,
2646 switches::kAllowNaClFileHandleAPI); 2629 switches::kAllowNaClFileHandleAPI);
2647 #else 2630 #else
2648 return false; 2631 return false;
2649 #endif 2632 #endif
2650 } 2633 }
2651 2634
2652 } // namespace chrome 2635 } // namespace chrome
OLDNEW
« 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