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

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: NoteAppInfo => settings.NoteAppInfo Created 3 years, 10 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 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 #include "chrome/browser/ui/ash/ash_util.h" 51 #include "chrome/browser/ui/ash/ash_util.h"
52 #include "chrome/browser/ui/webui/settings/chromeos/accessibility_handler.h" 52 #include "chrome/browser/ui/webui/settings/chromeos/accessibility_handler.h"
53 #include "chrome/browser/ui/webui/settings/chromeos/android_apps_handler.h" 53 #include "chrome/browser/ui/webui/settings/chromeos/android_apps_handler.h"
54 #include "chrome/browser/ui/webui/settings/chromeos/change_picture_handler.h" 54 #include "chrome/browser/ui/webui/settings/chromeos/change_picture_handler.h"
55 #include "chrome/browser/ui/webui/settings/chromeos/cups_printers_handler.h" 55 #include "chrome/browser/ui/webui/settings/chromeos/cups_printers_handler.h"
56 #include "chrome/browser/ui/webui/settings/chromeos/date_time_handler.h" 56 #include "chrome/browser/ui/webui/settings/chromeos/date_time_handler.h"
57 #include "chrome/browser/ui/webui/settings/chromeos/device_keyboard_handler.h" 57 #include "chrome/browser/ui/webui/settings/chromeos/device_keyboard_handler.h"
58 #include "chrome/browser/ui/webui/settings/chromeos/device_pointer_handler.h" 58 #include "chrome/browser/ui/webui/settings/chromeos/device_pointer_handler.h"
59 #include "chrome/browser/ui/webui/settings/chromeos/device_power_handler.h" 59 #include "chrome/browser/ui/webui/settings/chromeos/device_power_handler.h"
60 #include "chrome/browser/ui/webui/settings/chromeos/device_storage_handler.h" 60 #include "chrome/browser/ui/webui/settings/chromeos/device_storage_handler.h"
61 #include "chrome/browser/ui/webui/settings/chromeos/device_stylus_handler.h"
61 #include "chrome/browser/ui/webui/settings/chromeos/easy_unlock_settings_handler .h" 62 #include "chrome/browser/ui/webui/settings/chromeos/easy_unlock_settings_handler .h"
62 #include "chrome/browser/ui/webui/settings/chromeos/fingerprint_handler.h" 63 #include "chrome/browser/ui/webui/settings/chromeos/fingerprint_handler.h"
63 #include "chrome/browser/ui/webui/settings/chromeos/internet_handler.h" 64 #include "chrome/browser/ui/webui/settings/chromeos/internet_handler.h"
64 #include "chrome/common/chrome_switches.h" 65 #include "chrome/common/chrome_switches.h"
65 #include "components/arc/arc_util.h" 66 #include "components/arc/arc_util.h"
66 #else // !defined(OS_CHROMEOS) 67 #else // !defined(OS_CHROMEOS)
67 #include "chrome/browser/ui/webui/settings/settings_default_browser_handler.h" 68 #include "chrome/browser/ui/webui/settings/settings_default_browser_handler.h"
68 #include "chrome/browser/ui/webui/settings/settings_manage_profile_handler.h" 69 #include "chrome/browser/ui/webui/settings/settings_manage_profile_handler.h"
69 #include "chrome/browser/ui/webui/settings/system_handler.h" 70 #include "chrome/browser/ui/webui/settings/system_handler.h"
70 #endif // defined(OS_CHROMEOS) 71 #endif // defined(OS_CHROMEOS)
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
123 base::MakeUnique<chromeos::settings::CupsPrintersHandler>(web_ui)); 124 base::MakeUnique<chromeos::settings::CupsPrintersHandler>(web_ui));
124 AddSettingsPageUIHandler( 125 AddSettingsPageUIHandler(
125 base::MakeUnique<chromeos::settings::FingerprintHandler>()); 126 base::MakeUnique<chromeos::settings::FingerprintHandler>());
126 AddSettingsPageUIHandler( 127 AddSettingsPageUIHandler(
127 base::MakeUnique<chromeos::settings::KeyboardHandler>(web_ui)); 128 base::MakeUnique<chromeos::settings::KeyboardHandler>(web_ui));
128 AddSettingsPageUIHandler( 129 AddSettingsPageUIHandler(
129 base::MakeUnique<chromeos::settings::PointerHandler>()); 130 base::MakeUnique<chromeos::settings::PointerHandler>());
130 AddSettingsPageUIHandler( 131 AddSettingsPageUIHandler(
131 base::MakeUnique<chromeos::settings::StorageHandler>()); 132 base::MakeUnique<chromeos::settings::StorageHandler>());
132 AddSettingsPageUIHandler( 133 AddSettingsPageUIHandler(
134 base::MakeUnique<chromeos::settings::StylusHandler>());
135 AddSettingsPageUIHandler(
133 base::MakeUnique<chromeos::settings::InternetHandler>()); 136 base::MakeUnique<chromeos::settings::InternetHandler>());
134 #else 137 #else
135 AddSettingsPageUIHandler(base::MakeUnique<DefaultBrowserHandler>(web_ui)); 138 AddSettingsPageUIHandler(base::MakeUnique<DefaultBrowserHandler>(web_ui));
136 AddSettingsPageUIHandler(base::MakeUnique<ManageProfileHandler>(profile)); 139 AddSettingsPageUIHandler(base::MakeUnique<ManageProfileHandler>(profile));
137 AddSettingsPageUIHandler(base::MakeUnique<SystemHandler>()); 140 AddSettingsPageUIHandler(base::MakeUnique<SystemHandler>());
138 #endif 141 #endif
139 142
140 // Host must be derived from the visible URL, since this might be serving 143 // Host must be derived from the visible URL, since this might be serving
141 // either chrome://settings or chrome://md-settings. 144 // either chrome://settings or chrome://md-settings.
142 CHECK(url.GetOrigin() == GURL(chrome::kChromeUISettingsURL).GetOrigin() || 145 CHECK(url.GetOrigin() == GURL(chrome::kChromeUISettingsURL).GetOrigin() ||
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
222 UMA_HISTOGRAM_TIMES("Settings.LoadDocumentTime.MD", 225 UMA_HISTOGRAM_TIMES("Settings.LoadDocumentTime.MD",
223 base::Time::Now() - load_start_time_); 226 base::Time::Now() - load_start_time_);
224 } 227 }
225 228
226 void MdSettingsUI::DocumentOnLoadCompletedInMainFrame() { 229 void MdSettingsUI::DocumentOnLoadCompletedInMainFrame() {
227 UMA_HISTOGRAM_TIMES("Settings.LoadCompletedTime.MD", 230 UMA_HISTOGRAM_TIMES("Settings.LoadCompletedTime.MD",
228 base::Time::Now() - load_start_time_); 231 base::Time::Now() - load_start_time_);
229 } 232 }
230 233
231 } // namespace settings 234 } // namespace settings
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698