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

Side by Side Diff: chrome/browser/ui/webui/settings/font_handler.cc

Issue 2927273002: Move code for old, deprecated Options UI to only ChromeOS (Closed)
Patch Set: check_gn_headers Created 3 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
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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/webui/settings/font_handler.h" 5 #include "chrome/browser/ui/webui/settings/font_handler.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <string> 8 #include <string>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
11 11
12 #include "base/bind_helpers.h" 12 #include "base/bind_helpers.h"
13 #include "base/i18n/rtl.h" 13 #include "base/i18n/rtl.h"
14 #include "chrome/browser/browser_process.h" 14 #include "chrome/browser/browser_process.h"
15 #include "chrome/browser/extensions/extension_service.h" 15 #include "chrome/browser/extensions/extension_service.h"
16 #include "chrome/browser/extensions/extension_tab_util.h" 16 #include "chrome/browser/extensions/extension_tab_util.h"
17 #include "chrome/browser/profiles/profile.h" 17 #include "chrome/browser/profiles/profile.h"
18 #include "chrome/browser/ui/browser_finder.h" 18 #include "chrome/browser/ui/browser_finder.h"
19 #include "chrome/browser/ui/webui/options/font_settings_utils.h"
20 #include "chrome/common/pref_names.h" 19 #include "chrome/common/pref_names.h"
21 #include "components/prefs/pref_service.h" 20 #include "components/prefs/pref_service.h"
22 #include "content/public/browser/font_list_async.h" 21 #include "content/public/browser/font_list_async.h"
23 #include "content/public/browser/web_ui.h" 22 #include "content/public/browser/web_ui.h"
24 #include "extensions/browser/extension_registry.h" 23 #include "extensions/browser/extension_registry.h"
25 #include "extensions/browser/extension_system.h" 24 #include "extensions/browser/extension_system.h"
26 #include "extensions/common/extension_urls.h" 25 #include "extensions/common/extension_urls.h"
27 26
27 #if defined(OS_MACOSX)
28 #include "chrome/browser/ui/webui/settings_utils.h"
29 #endif
30
28 namespace { 31 namespace {
29 32
30 const char kAdvancedFontSettingsExtensionId[] = 33 const char kAdvancedFontSettingsExtensionId[] =
31 "caclkomlalccbpcdllchkeecicepbmbm"; 34 "caclkomlalccbpcdllchkeecicepbmbm";
32 35
33 } // namespace 36 } // namespace
34 37
35 namespace settings { 38 namespace settings {
36 39
37 FontHandler::FontHandler(content::WebUI* webui) 40 FontHandler::FontHandler(content::WebUI* webui)
38 : extension_registry_observer_(this), 41 : extension_registry_observer_(this),
39 profile_(Profile::FromWebUI(webui)), 42 profile_(Profile::FromWebUI(webui)),
40 weak_ptr_factory_(this) { 43 weak_ptr_factory_(this) {
44 #if defined(OS_MACOSX)
41 // Perform validation for saved fonts. 45 // Perform validation for saved fonts.
42 options::FontSettingsUtilities::ValidateSavedFonts(profile_->GetPrefs()); 46 settings_utils::ValidateSavedFonts(profile_->GetPrefs());
47 #endif
43 } 48 }
44 49
45 FontHandler::~FontHandler() {} 50 FontHandler::~FontHandler() {}
46 51
47 void FontHandler::RegisterMessages() { 52 void FontHandler::RegisterMessages() {
48 web_ui()->RegisterMessageCallback( 53 web_ui()->RegisterMessageCallback(
49 "fetchFontsData", base::Bind(&FontHandler::HandleFetchFontsData, 54 "fetchFontsData", base::Bind(&FontHandler::HandleFetchFontsData,
50 base::Unretained(this))); 55 base::Unretained(this)));
51 web_ui()->RegisterMessageCallback( 56 web_ui()->RegisterMessageCallback(
52 "observeAdvancedFontExtensionAvailable", 57 "observeAdvancedFontExtensionAvailable",
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
140 145
141 GURL extension_url(extension_urls::GetWebstoreItemDetailURLPrefix()); 146 GURL extension_url(extension_urls::GetWebstoreItemDetailURLPrefix());
142 response.SetString( 147 response.SetString(
143 "extensionUrl", 148 "extensionUrl",
144 extension_url.Resolve(kAdvancedFontSettingsExtensionId).spec()); 149 extension_url.Resolve(kAdvancedFontSettingsExtensionId).spec());
145 150
146 ResolveJavascriptCallback(base::Value(callback_id), response); 151 ResolveJavascriptCallback(base::Value(callback_id), response);
147 } 152 }
148 153
149 } // namespace settings 154 } // namespace settings
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698