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

Side by Side Diff: chrome/browser/ui/tab_contents/tab_contents_wrapper.cc

Issue 6602021: web-ui settings: Standard font setting now correlates to WebKit's standard fo... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: rebase Created 9 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/tab_contents/tab_contents_wrapper.h" 5 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
6 6
7 #include "base/lazy_instance.h" 7 #include "base/lazy_instance.h"
8 #include "chrome/browser/bookmarks/bookmark_model.h" 8 #include "chrome/browser/bookmarks/bookmark_model.h"
9 #include "chrome/browser/custom_handlers/protocol_handler_registry.h" 9 #include "chrome/browser/custom_handlers/protocol_handler_registry.h"
10 #include "chrome/browser/custom_handlers/register_protocol_handler_infobar_deleg ate.h" 10 #include "chrome/browser/custom_handlers/register_protocol_handler_infobar_deleg ate.h"
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
88 pref_defaults.text_areas_are_resizable); 88 pref_defaults.text_areas_are_resizable);
89 prefs->RegisterBooleanPref(prefs::kWebKitJavaEnabled, 89 prefs->RegisterBooleanPref(prefs::kWebKitJavaEnabled,
90 pref_defaults.java_enabled); 90 pref_defaults.java_enabled);
91 prefs->RegisterBooleanPref(prefs::kWebkitTabsToLinks, 91 prefs->RegisterBooleanPref(prefs::kWebkitTabsToLinks,
92 pref_defaults.tabs_to_links); 92 pref_defaults.tabs_to_links);
93 93
94 prefs->RegisterLocalizedStringPref(prefs::kAcceptLanguages, 94 prefs->RegisterLocalizedStringPref(prefs::kAcceptLanguages,
95 IDS_ACCEPT_LANGUAGES); 95 IDS_ACCEPT_LANGUAGES);
96 prefs->RegisterLocalizedStringPref(prefs::kDefaultCharset, 96 prefs->RegisterLocalizedStringPref(prefs::kDefaultCharset,
97 IDS_DEFAULT_ENCODING); 97 IDS_DEFAULT_ENCODING);
98 prefs->RegisterLocalizedBooleanPref(prefs::kWebKitStandardFontIsSerif, 98 prefs->RegisterLocalizedStringPref(prefs::kWebKitStandardFontFamily,
99 IDS_STANDARD_FONT_IS_SERIF); 99 IDS_STANDARD_FONT_FAMILY);
100 prefs->RegisterLocalizedStringPref(prefs::kWebKitFixedFontFamily, 100 prefs->RegisterLocalizedStringPref(prefs::kWebKitFixedFontFamily,
101 IDS_FIXED_FONT_FAMILY); 101 IDS_FIXED_FONT_FAMILY);
102 prefs->RegisterLocalizedStringPref(prefs::kWebKitSerifFontFamily, 102 prefs->RegisterLocalizedStringPref(prefs::kWebKitSerifFontFamily,
103 IDS_SERIF_FONT_FAMILY); 103 IDS_SERIF_FONT_FAMILY);
104 prefs->RegisterLocalizedStringPref(prefs::kWebKitSansSerifFontFamily, 104 prefs->RegisterLocalizedStringPref(prefs::kWebKitSansSerifFontFamily,
105 IDS_SANS_SERIF_FONT_FAMILY); 105 IDS_SANS_SERIF_FONT_FAMILY);
106 prefs->RegisterLocalizedStringPref(prefs::kWebKitCursiveFontFamily, 106 prefs->RegisterLocalizedStringPref(prefs::kWebKitCursiveFontFamily,
107 IDS_CURSIVE_FONT_FAMILY); 107 IDS_CURSIVE_FONT_FAMILY);
108 prefs->RegisterLocalizedStringPref(prefs::kWebKitFantasyFontFamily, 108 prefs->RegisterLocalizedStringPref(prefs::kWebKitFantasyFontFamily,
109 IDS_FANTASY_FONT_FAMILY); 109 IDS_FANTASY_FONT_FAMILY);
(...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after
251 } 251 }
252 252
253 void TabContentsWrapper::UpdateStarredStateForCurrentURL() { 253 void TabContentsWrapper::UpdateStarredStateForCurrentURL() {
254 BookmarkModel* model = tab_contents()->profile()->GetBookmarkModel(); 254 BookmarkModel* model = tab_contents()->profile()->GetBookmarkModel();
255 const bool old_state = is_starred_; 255 const bool old_state = is_starred_;
256 is_starred_ = (model && model->IsBookmarked(tab_contents()->GetURL())); 256 is_starred_ = (model && model->IsBookmarked(tab_contents()->GetURL()));
257 257
258 if (is_starred_ != old_state && delegate()) 258 if (is_starred_ != old_state && delegate())
259 delegate()->URLStarredChanged(this, is_starred_); 259 delegate()->URLStarredChanged(this, is_starred_);
260 } 260 }
OLDNEW
« no previous file with comments | « chrome/browser/tab_contents/web_contents_unittest.cc ('k') | chrome/browser/ui/webui/options/font_settings_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698