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

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

Issue 2178213002: Add note page to settings. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@stylus-add-switch
Patch Set: Comments Created 4 years, 4 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/md_settings_ui.h" 5 #include "chrome/browser/ui/webui/settings/md_settings_ui.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <string> 9 #include <string>
10 10
(...skipping 23 matching lines...) Expand all
34 #include "content/public/browser/web_ui_data_source.h" 34 #include "content/public/browser/web_ui_data_source.h"
35 #include "grit/settings_resources.h" 35 #include "grit/settings_resources.h"
36 #include "grit/settings_resources_map.h" 36 #include "grit/settings_resources_map.h"
37 37
38 #if defined(OS_CHROMEOS) 38 #if defined(OS_CHROMEOS)
39 #include "chrome/browser/chromeos/login/quick_unlock/quick_unlock_utils.h" 39 #include "chrome/browser/chromeos/login/quick_unlock/quick_unlock_utils.h"
40 #include "chrome/browser/ui/webui/settings/chromeos/change_picture_handler.h" 40 #include "chrome/browser/ui/webui/settings/chromeos/change_picture_handler.h"
41 #include "chrome/browser/ui/webui/settings/chromeos/device_keyboard_handler.h" 41 #include "chrome/browser/ui/webui/settings/chromeos/device_keyboard_handler.h"
42 #include "chrome/browser/ui/webui/settings/chromeos/device_pointer_handler.h" 42 #include "chrome/browser/ui/webui/settings/chromeos/device_pointer_handler.h"
43 #include "chrome/browser/ui/webui/settings/chromeos/easy_unlock_settings_handler .h" 43 #include "chrome/browser/ui/webui/settings/chromeos/easy_unlock_settings_handler .h"
44 #include "chrome/browser/ui/webui/settings/chromeos/note_handler.h"
44 #else // !defined(OS_CHROMEOS) 45 #else // !defined(OS_CHROMEOS)
45 #include "chrome/browser/ui/webui/settings/settings_default_browser_handler.h" 46 #include "chrome/browser/ui/webui/settings/settings_default_browser_handler.h"
46 #include "chrome/browser/ui/webui/settings/settings_manage_profile_handler.h" 47 #include "chrome/browser/ui/webui/settings/settings_manage_profile_handler.h"
47 #include "chrome/browser/ui/webui/settings/system_handler.h" 48 #include "chrome/browser/ui/webui/settings/system_handler.h"
48 #endif // defined(OS_CHROMEOS) 49 #endif // defined(OS_CHROMEOS)
49 50
50 #if defined(USE_NSS_CERTS) 51 #if defined(USE_NSS_CERTS)
51 #include "chrome/browser/ui/webui/settings/certificates_handler.h" 52 #include "chrome/browser/ui/webui/settings/certificates_handler.h"
52 #elif defined(OS_WIN) || defined(OS_MACOSX) 53 #elif defined(OS_WIN) || defined(OS_MACOSX)
53 #include "chrome/browser/ui/webui/settings/native_certificates_handler.h" 54 #include "chrome/browser/ui/webui/settings/native_certificates_handler.h"
54 #endif // defined(USE_NSS_CERTS) 55 #endif // defined(USE_NSS_CERTS)
55 56
56 namespace settings { 57 namespace settings {
57 58
58 MdSettingsUI::MdSettingsUI(content::WebUI* web_ui, const GURL& url) 59 MdSettingsUI::MdSettingsUI(content::WebUI* web_ui, const GURL& url)
59 : content::WebUIController(web_ui), 60 : content::WebUIController(web_ui),
60 WebContentsObserver(web_ui->GetWebContents()) { 61 WebContentsObserver(web_ui->GetWebContents()) {
61 Profile* profile = Profile::FromWebUI(web_ui); 62 Profile* profile = Profile::FromWebUI(web_ui);
62 AddSettingsPageUIHandler(new AppearanceHandler(web_ui)); 63 AddSettingsPageUIHandler(new AppearanceHandler(web_ui));
64 content::WebUIDataSource* html_source =
65 content::WebUIDataSource::Create(url.host());
63 66
64 #if defined(USE_NSS_CERTS) 67 #if defined(USE_NSS_CERTS)
65 AddSettingsPageUIHandler(new CertificatesHandler(false)); 68 AddSettingsPageUIHandler(new CertificatesHandler(false));
66 #elif defined(OS_WIN) || defined(OS_MACOSX) 69 #elif defined(OS_WIN) || defined(OS_MACOSX)
67 AddSettingsPageUIHandler(new NativeCertificatesHandler()); 70 AddSettingsPageUIHandler(new NativeCertificatesHandler());
68 #endif // defined(USE_NSS_CERTS) 71 #endif // defined(USE_NSS_CERTS)
69 72
70 AddSettingsPageUIHandler(new ClearBrowsingDataHandler(web_ui)); 73 AddSettingsPageUIHandler(new ClearBrowsingDataHandler(web_ui));
71 AddSettingsPageUIHandler(new BrowserLifetimeHandler()); 74 AddSettingsPageUIHandler(new BrowserLifetimeHandler());
72 AddSettingsPageUIHandler(new CookiesViewHandler()); 75 AddSettingsPageUIHandler(new CookiesViewHandler());
73 AddSettingsPageUIHandler(new DownloadsHandler()); 76 AddSettingsPageUIHandler(new DownloadsHandler());
74 AddSettingsPageUIHandler(new FontHandler(web_ui)); 77 AddSettingsPageUIHandler(new FontHandler(web_ui));
75 AddSettingsPageUIHandler(new ProtocolHandlersHandler()); 78 AddSettingsPageUIHandler(new ProtocolHandlersHandler());
76 AddSettingsPageUIHandler(new LanguagesHandler(web_ui)); 79 AddSettingsPageUIHandler(new LanguagesHandler(web_ui));
77 AddSettingsPageUIHandler(new MediaDevicesSelectionHandler(profile)); 80 AddSettingsPageUIHandler(new MediaDevicesSelectionHandler(profile));
78 AddSettingsPageUIHandler(new PeopleHandler(profile)); 81 AddSettingsPageUIHandler(new PeopleHandler(profile));
79 AddSettingsPageUIHandler(new ProfileInfoHandler(profile)); 82 AddSettingsPageUIHandler(new ProfileInfoHandler(profile));
80 AddSettingsPageUIHandler(new SearchEnginesHandler(profile)); 83 AddSettingsPageUIHandler(new SearchEnginesHandler(profile));
81 AddSettingsPageUIHandler(new SiteSettingsHandler(profile)); 84 AddSettingsPageUIHandler(new SiteSettingsHandler(profile));
82 AddSettingsPageUIHandler(new StartupPagesHandler(web_ui)); 85 AddSettingsPageUIHandler(new StartupPagesHandler(web_ui));
83 86
84 #if defined(OS_CHROMEOS) 87 #if defined(OS_CHROMEOS)
85 AddSettingsPageUIHandler(new chromeos::settings::ChangePictureHandler()); 88 AddSettingsPageUIHandler(new chromeos::settings::ChangePictureHandler());
86 AddSettingsPageUIHandler(new chromeos::settings::KeyboardHandler(web_ui)); 89 AddSettingsPageUIHandler(new chromeos::settings::KeyboardHandler(web_ui));
90 AddSettingsPageUIHandler(new chromeos::settings::NoteHandler(html_source));
87 AddSettingsPageUIHandler(new chromeos::settings::PointerHandler()); 91 AddSettingsPageUIHandler(new chromeos::settings::PointerHandler());
88 #else 92 #else
89 AddSettingsPageUIHandler(new DefaultBrowserHandler(web_ui)); 93 AddSettingsPageUIHandler(new DefaultBrowserHandler(web_ui));
90 AddSettingsPageUIHandler(new ManageProfileHandler(profile)); 94 AddSettingsPageUIHandler(new ManageProfileHandler(profile));
91 AddSettingsPageUIHandler(new SystemHandler()); 95 AddSettingsPageUIHandler(new SystemHandler());
92 #endif 96 #endif
93 97
94 // Host must be derived from the visible URL, since this might be serving 98 // Host must be derived from the visible URL, since this might be serving
95 // either chrome://settings or chrome://md-settings. 99 // either chrome://settings or chrome://md-settings.
96 CHECK(url.GetOrigin() == GURL(chrome::kChromeUISettingsURL).GetOrigin() || 100 CHECK(url.GetOrigin() == GURL(chrome::kChromeUISettingsURL).GetOrigin() ||
97 url.GetOrigin() == GURL(chrome::kChromeUIMdSettingsURL).GetOrigin()); 101 url.GetOrigin() == GURL(chrome::kChromeUIMdSettingsURL).GetOrigin());
98 102
99 content::WebUIDataSource* html_source =
100 content::WebUIDataSource::Create(url.host());
101
102 #if defined(OS_CHROMEOS) 103 #if defined(OS_CHROMEOS)
103 chromeos::settings::EasyUnlockSettingsHandler* easy_unlock_handler = 104 chromeos::settings::EasyUnlockSettingsHandler* easy_unlock_handler =
104 chromeos::settings::EasyUnlockSettingsHandler::Create(html_source, 105 chromeos::settings::EasyUnlockSettingsHandler::Create(html_source,
105 profile); 106 profile);
106 if (easy_unlock_handler) 107 if (easy_unlock_handler)
107 AddSettingsPageUIHandler(easy_unlock_handler); 108 AddSettingsPageUIHandler(easy_unlock_handler);
108 109
109 html_source->AddBoolean("quickUnlockEnabled", 110 html_source->AddBoolean("quickUnlockEnabled",
110 chromeos::IsQuickUnlockEnabled()); 111 chromeos::IsQuickUnlockEnabled());
111 #endif 112 #endif
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
148 UMA_HISTOGRAM_TIMES("Settings.LoadDocumentTime.MD", 149 UMA_HISTOGRAM_TIMES("Settings.LoadDocumentTime.MD",
149 base::Time::Now() - load_start_time_); 150 base::Time::Now() - load_start_time_);
150 } 151 }
151 152
152 void MdSettingsUI::DocumentOnLoadCompletedInMainFrame() { 153 void MdSettingsUI::DocumentOnLoadCompletedInMainFrame() {
153 UMA_HISTOGRAM_TIMES("Settings.LoadCompletedTime.MD", 154 UMA_HISTOGRAM_TIMES("Settings.LoadCompletedTime.MD",
154 base::Time::Now() - load_start_time_); 155 base::Time::Now() - load_start_time_);
155 } 156 }
156 157
157 } // namespace settings 158 } // namespace settings
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698