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

Side by Side Diff: chrome/browser/ui/prefs/prefs_tab_helper.cc

Issue 12340111: Introduce //components/user_prefs, use to eliminate c/b/prefs dependency in Autofill. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Pure merge of LKGR Created 7 years, 9 months 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
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/ui/prefs/prefs_tab_helper.h" 5 #include "chrome/browser/ui/prefs/prefs_tab_helper.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/prefs/overlay_user_pref_store.h" 9 #include "base/prefs/overlay_user_pref_store.h"
10 #include "base/prefs/pref_service.h" 10 #include "base/prefs/pref_service.h"
11 #include "base/string_util.h" 11 #include "base/string_util.h"
12 #include "base/stringprintf.h" 12 #include "base/stringprintf.h"
13 #include "base/utf_string_conversions.h" 13 #include "base/utf_string_conversions.h"
14 #include "chrome/browser/browser_process.h" 14 #include "chrome/browser/browser_process.h"
15 #include "chrome/browser/prefs/pref_registry_syncable.h"
16 #include "chrome/browser/profiles/profile.h" 15 #include "chrome/browser/profiles/profile.h"
17 #include "chrome/browser/renderer_preferences_util.h" 16 #include "chrome/browser/renderer_preferences_util.h"
18 #include "chrome/common/chrome_notification_types.h" 17 #include "chrome/common/chrome_notification_types.h"
19 #include "chrome/common/pref_names.h" 18 #include "chrome/common/pref_names.h"
20 #include "chrome/common/pref_names_util.h" 19 #include "chrome/common/pref_names_util.h"
20 #include "components/user_prefs/pref_registry_syncable.h"
21 #include "content/public/browser/notification_details.h" 21 #include "content/public/browser/notification_details.h"
22 #include "content/public/browser/notification_service.h" 22 #include "content/public/browser/notification_service.h"
23 #include "content/public/browser/render_view_host.h" 23 #include "content/public/browser/render_view_host.h"
24 #include "content/public/browser/web_contents.h" 24 #include "content/public/browser/web_contents.h"
25 #include "grit/locale_settings.h" 25 #include "grit/locale_settings.h"
26 #include "grit/platform_locale_settings.h" 26 #include "grit/platform_locale_settings.h"
27 #include "third_party/icu/public/common/unicode/uchar.h" 27 #include "third_party/icu/public/common/unicode/uchar.h"
28 #include "third_party/icu/public/common/unicode/uscript.h" 28 #include "third_party/icu/public/common/unicode/uscript.h"
29 #include "webkit/glue/webpreferences.h" 29 #include "webkit/glue/webpreferences.h"
30 30
(...skipping 623 matching lines...) Expand 10 before | Expand all | Expand 10 after
654 WebPreferences web_prefs = 654 WebPreferences web_prefs =
655 web_contents_->GetRenderViewHost()->GetWebkitPreferences(); 655 web_contents_->GetRenderViewHost()->GetWebkitPreferences();
656 OverrideFontFamily(&web_prefs, generic_family, script, ""); 656 OverrideFontFamily(&web_prefs, generic_family, script, "");
657 web_contents_->GetRenderViewHost()->UpdateWebkitPreferences(web_prefs); 657 web_contents_->GetRenderViewHost()->UpdateWebkitPreferences(web_prefs);
658 return; 658 return;
659 } 659 }
660 } 660 }
661 661
662 UpdateWebPreferences(); 662 UpdateWebPreferences();
663 } 663 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698