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

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

Issue 11734021: Roll ICU and convert include style to standard Chromium style, (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 11 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/string_util.h" 10 #include "base/string_util.h"
11 #include "base/stringprintf.h" 11 #include "base/stringprintf.h"
12 #include "base/utf_string_conversions.h" 12 #include "base/utf_string_conversions.h"
13 #include "chrome/browser/browser_process.h" 13 #include "chrome/browser/browser_process.h"
14 #include "chrome/browser/prefs/pref_service.h" 14 #include "chrome/browser/prefs/pref_service.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_names.h" 18 #include "chrome/common/pref_names.h"
19 #include "chrome/common/pref_names_util.h" 19 #include "chrome/common/pref_names_util.h"
20 #include "content/public/browser/notification_details.h" 20 #include "content/public/browser/notification_details.h"
21 #include "content/public/browser/notification_service.h" 21 #include "content/public/browser/notification_service.h"
22 #include "content/public/browser/render_view_host.h" 22 #include "content/public/browser/render_view_host.h"
23 #include "content/public/browser/web_contents.h" 23 #include "content/public/browser/web_contents.h"
24 #include "grit/locale_settings.h" 24 #include "grit/locale_settings.h"
25 #include "grit/platform_locale_settings.h" 25 #include "grit/platform_locale_settings.h"
26 #include "unicode/uchar.h" 26 #include "third_party/icu/public/common/unicode/uchar.h"
27 #include "unicode/uscript.h" 27 #include "third_party/icu/public/common/unicode/uscript.h"
28 #include "webkit/glue/webpreferences.h" 28 #include "webkit/glue/webpreferences.h"
29 29
30 #if defined(OS_POSIX) && !defined(OS_MACOSX) && defined(ENABLE_THEMES) 30 #if defined(OS_POSIX) && !defined(OS_MACOSX) && defined(ENABLE_THEMES)
31 #include "chrome/browser/themes/theme_service.h" 31 #include "chrome/browser/themes/theme_service.h"
32 #include "chrome/browser/themes/theme_service_factory.h" 32 #include "chrome/browser/themes/theme_service_factory.h"
33 #endif 33 #endif
34 34
35 using content::WebContents; 35 using content::WebContents;
36 using webkit_glue::WebPreferences; 36 using webkit_glue::WebPreferences;
37 37
(...skipping 605 matching lines...) Expand 10 before | Expand all | Expand 10 after
643 WebPreferences web_prefs = 643 WebPreferences web_prefs =
644 web_contents_->GetRenderViewHost()->GetWebkitPreferences(); 644 web_contents_->GetRenderViewHost()->GetWebkitPreferences();
645 OverrideFontFamily(&web_prefs, generic_family, script, ""); 645 OverrideFontFamily(&web_prefs, generic_family, script, "");
646 web_contents_->GetRenderViewHost()->UpdateWebkitPreferences(web_prefs); 646 web_contents_->GetRenderViewHost()->UpdateWebkitPreferences(web_prefs);
647 return; 647 return;
648 } 648 }
649 } 649 }
650 650
651 UpdateWebPreferences(); 651 UpdateWebPreferences();
652 } 652 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/omnibox/omnibox_popup_model.cc ('k') | chrome/browser/ui/views/download/download_item_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698