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

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

Issue 16216007: split webkit/glue/webpreferences to common and renderer (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: new location for public/platform Created 7 years, 6 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/profiles/profile.h" 15 #include "chrome/browser/profiles/profile.h"
16 #include "chrome/browser/renderer_preferences_util.h" 16 #include "chrome/browser/renderer_preferences_util.h"
17 #include "chrome/common/chrome_notification_types.h" 17 #include "chrome/common/chrome_notification_types.h"
18 #include "chrome/common/pref_font_webkit_names.h" 18 #include "chrome/common/pref_font_webkit_names.h"
19 #include "chrome/common/pref_names.h" 19 #include "chrome/common/pref_names.h"
20 #include "chrome/common/pref_names_util.h" 20 #include "chrome/common/pref_names_util.h"
21 #include "components/user_prefs/pref_registry_syncable.h" 21 #include "components/user_prefs/pref_registry_syncable.h"
22 #include "content/public/browser/notification_details.h" 22 #include "content/public/browser/notification_details.h"
23 #include "content/public/browser/notification_service.h" 23 #include "content/public/browser/notification_service.h"
24 #include "content/public/browser/render_view_host.h" 24 #include "content/public/browser/render_view_host.h"
25 #include "content/public/browser/web_contents.h" 25 #include "content/public/browser/web_contents.h"
26 #include "grit/locale_settings.h" 26 #include "grit/locale_settings.h"
27 #include "grit/platform_locale_settings.h" 27 #include "grit/platform_locale_settings.h"
28 #include "third_party/icu/public/common/unicode/uchar.h" 28 #include "third_party/icu/public/common/unicode/uchar.h"
29 #include "third_party/icu/public/common/unicode/uscript.h" 29 #include "third_party/icu/public/common/unicode/uscript.h"
30 #include "webkit/glue/webpreferences.h" 30 #include "webkit/common/webpreferences.h"
31 31
32 #if defined(OS_POSIX) && !defined(OS_MACOSX) && defined(ENABLE_THEMES) 32 #if defined(OS_POSIX) && !defined(OS_MACOSX) && defined(ENABLE_THEMES)
33 #include "chrome/browser/themes/theme_service.h" 33 #include "chrome/browser/themes/theme_service.h"
34 #include "chrome/browser/themes/theme_service_factory.h" 34 #include "chrome/browser/themes/theme_service_factory.h"
35 #endif 35 #endif
36 36
37 using content::WebContents; 37 using content::WebContents;
38 38
39 DEFINE_WEB_CONTENTS_USER_DATA_KEY(PrefsTabHelper); 39 DEFINE_WEB_CONTENTS_USER_DATA_KEY(PrefsTabHelper);
40 40
(...skipping 673 matching lines...) Expand 10 before | Expand all | Expand 10 after
714 WebPreferences web_prefs = 714 WebPreferences web_prefs =
715 web_contents_->GetRenderViewHost()->GetWebkitPreferences(); 715 web_contents_->GetRenderViewHost()->GetWebkitPreferences();
716 OverrideFontFamily(&web_prefs, generic_family, script, std::string()); 716 OverrideFontFamily(&web_prefs, generic_family, script, std::string());
717 web_contents_->GetRenderViewHost()->UpdateWebkitPreferences(web_prefs); 717 web_contents_->GetRenderViewHost()->UpdateWebkitPreferences(web_prefs);
718 return; 718 return;
719 } 719 }
720 } 720 }
721 721
722 UpdateWebPreferences(); 722 UpdateWebPreferences();
723 } 723 }
OLDNEW
« no previous file with comments | « chrome/browser/printing/print_dialog_cloud.cc ('k') | chrome/browser/ui/webui/task_manager/task_manager_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698