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

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

Issue 2630623002: cros: Allow user to configure note taking app in md-settings. (Closed)
Patch Set: Initial upload Created 3 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
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 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 #include "chrome/browser/ui/ash/ash_util.h" 50 #include "chrome/browser/ui/ash/ash_util.h"
51 #include "chrome/browser/ui/webui/settings/chromeos/accessibility_handler.h" 51 #include "chrome/browser/ui/webui/settings/chromeos/accessibility_handler.h"
52 #include "chrome/browser/ui/webui/settings/chromeos/android_apps_handler.h" 52 #include "chrome/browser/ui/webui/settings/chromeos/android_apps_handler.h"
53 #include "chrome/browser/ui/webui/settings/chromeos/change_picture_handler.h" 53 #include "chrome/browser/ui/webui/settings/chromeos/change_picture_handler.h"
54 #include "chrome/browser/ui/webui/settings/chromeos/cups_printers_handler.h" 54 #include "chrome/browser/ui/webui/settings/chromeos/cups_printers_handler.h"
55 #include "chrome/browser/ui/webui/settings/chromeos/date_time_handler.h" 55 #include "chrome/browser/ui/webui/settings/chromeos/date_time_handler.h"
56 #include "chrome/browser/ui/webui/settings/chromeos/device_keyboard_handler.h" 56 #include "chrome/browser/ui/webui/settings/chromeos/device_keyboard_handler.h"
57 #include "chrome/browser/ui/webui/settings/chromeos/device_pointer_handler.h" 57 #include "chrome/browser/ui/webui/settings/chromeos/device_pointer_handler.h"
58 #include "chrome/browser/ui/webui/settings/chromeos/device_power_handler.h" 58 #include "chrome/browser/ui/webui/settings/chromeos/device_power_handler.h"
59 #include "chrome/browser/ui/webui/settings/chromeos/device_storage_handler.h" 59 #include "chrome/browser/ui/webui/settings/chromeos/device_storage_handler.h"
60 #include "chrome/browser/ui/webui/settings/chromeos/device_stylus_handler.h"
60 #include "chrome/browser/ui/webui/settings/chromeos/easy_unlock_settings_handler .h" 61 #include "chrome/browser/ui/webui/settings/chromeos/easy_unlock_settings_handler .h"
61 #include "chrome/browser/ui/webui/settings/chromeos/internet_handler.h" 62 #include "chrome/browser/ui/webui/settings/chromeos/internet_handler.h"
62 #include "chrome/common/chrome_switches.h" 63 #include "chrome/common/chrome_switches.h"
63 #else // !defined(OS_CHROMEOS) 64 #else // !defined(OS_CHROMEOS)
64 #include "chrome/browser/ui/webui/settings/settings_default_browser_handler.h" 65 #include "chrome/browser/ui/webui/settings/settings_default_browser_handler.h"
65 #include "chrome/browser/ui/webui/settings/settings_manage_profile_handler.h" 66 #include "chrome/browser/ui/webui/settings/settings_manage_profile_handler.h"
66 #include "chrome/browser/ui/webui/settings/system_handler.h" 67 #include "chrome/browser/ui/webui/settings/system_handler.h"
67 #endif // defined(OS_CHROMEOS) 68 #endif // defined(OS_CHROMEOS)
68 69
69 #if defined(USE_NSS_CERTS) 70 #if defined(USE_NSS_CERTS)
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
118 base::MakeUnique<chromeos::settings::ChangePictureHandler>()); 119 base::MakeUnique<chromeos::settings::ChangePictureHandler>());
119 AddSettingsPageUIHandler( 120 AddSettingsPageUIHandler(
120 base::MakeUnique<chromeos::settings::CupsPrintersHandler>(web_ui)); 121 base::MakeUnique<chromeos::settings::CupsPrintersHandler>(web_ui));
121 AddSettingsPageUIHandler( 122 AddSettingsPageUIHandler(
122 base::MakeUnique<chromeos::settings::KeyboardHandler>(web_ui)); 123 base::MakeUnique<chromeos::settings::KeyboardHandler>(web_ui));
123 AddSettingsPageUIHandler( 124 AddSettingsPageUIHandler(
124 base::MakeUnique<chromeos::settings::PointerHandler>()); 125 base::MakeUnique<chromeos::settings::PointerHandler>());
125 AddSettingsPageUIHandler( 126 AddSettingsPageUIHandler(
126 base::MakeUnique<chromeos::settings::StorageHandler>()); 127 base::MakeUnique<chromeos::settings::StorageHandler>());
127 AddSettingsPageUIHandler( 128 AddSettingsPageUIHandler(
129 base::MakeUnique<chromeos::settings::StylusHandler>());
130 AddSettingsPageUIHandler(
128 base::MakeUnique<chromeos::settings::InternetHandler>()); 131 base::MakeUnique<chromeos::settings::InternetHandler>());
129 #else 132 #else
130 AddSettingsPageUIHandler(base::MakeUnique<DefaultBrowserHandler>(web_ui)); 133 AddSettingsPageUIHandler(base::MakeUnique<DefaultBrowserHandler>(web_ui));
131 AddSettingsPageUIHandler(base::MakeUnique<ManageProfileHandler>(profile)); 134 AddSettingsPageUIHandler(base::MakeUnique<ManageProfileHandler>(profile));
132 AddSettingsPageUIHandler(base::MakeUnique<SystemHandler>()); 135 AddSettingsPageUIHandler(base::MakeUnique<SystemHandler>());
133 #endif 136 #endif
134 137
135 // Host must be derived from the visible URL, since this might be serving 138 // Host must be derived from the visible URL, since this might be serving
136 // either chrome://settings or chrome://md-settings. 139 // either chrome://settings or chrome://md-settings.
137 CHECK(url.GetOrigin() == GURL(chrome::kChromeUISettingsURL).GetOrigin() || 140 CHECK(url.GetOrigin() == GURL(chrome::kChromeUISettingsURL).GetOrigin() ||
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
214 UMA_HISTOGRAM_TIMES("Settings.LoadDocumentTime.MD", 217 UMA_HISTOGRAM_TIMES("Settings.LoadDocumentTime.MD",
215 base::Time::Now() - load_start_time_); 218 base::Time::Now() - load_start_time_);
216 } 219 }
217 220
218 void MdSettingsUI::DocumentOnLoadCompletedInMainFrame() { 221 void MdSettingsUI::DocumentOnLoadCompletedInMainFrame() {
219 UMA_HISTOGRAM_TIMES("Settings.LoadCompletedTime.MD", 222 UMA_HISTOGRAM_TIMES("Settings.LoadCompletedTime.MD",
220 base::Time::Now() - load_start_time_); 223 base::Time::Now() - load_start_time_);
221 } 224 }
222 225
223 } // namespace settings 226 } // namespace settings
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698