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

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

Issue 2348913002: Port storage manager to MD settings. (Closed)
Patch Set: Address review comments 2. Created 4 years, 2 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 26 matching lines...) Expand all
37 #include "content/public/browser/web_ui_data_source.h" 37 #include "content/public/browser/web_ui_data_source.h"
38 38
39 #if defined(OS_CHROMEOS) 39 #if defined(OS_CHROMEOS)
40 #include "ash/common/system/chromeos/palette/palette_utils.h" 40 #include "ash/common/system/chromeos/palette/palette_utils.h"
41 #include "chrome/browser/chromeos/login/quick_unlock/quick_unlock_utils.h" 41 #include "chrome/browser/chromeos/login/quick_unlock/quick_unlock_utils.h"
42 #include "chrome/browser/ui/webui/settings/chromeos/accessibility_handler.h" 42 #include "chrome/browser/ui/webui/settings/chromeos/accessibility_handler.h"
43 #include "chrome/browser/ui/webui/settings/chromeos/change_picture_handler.h" 43 #include "chrome/browser/ui/webui/settings/chromeos/change_picture_handler.h"
44 #include "chrome/browser/ui/webui/settings/chromeos/cups_printers_handler.h" 44 #include "chrome/browser/ui/webui/settings/chromeos/cups_printers_handler.h"
45 #include "chrome/browser/ui/webui/settings/chromeos/device_keyboard_handler.h" 45 #include "chrome/browser/ui/webui/settings/chromeos/device_keyboard_handler.h"
46 #include "chrome/browser/ui/webui/settings/chromeos/device_pointer_handler.h" 46 #include "chrome/browser/ui/webui/settings/chromeos/device_pointer_handler.h"
47 #include "chrome/browser/ui/webui/settings/chromeos/device_storage_handler.h"
47 #include "chrome/browser/ui/webui/settings/chromeos/easy_unlock_settings_handler .h" 48 #include "chrome/browser/ui/webui/settings/chromeos/easy_unlock_settings_handler .h"
48 #include "chrome/browser/ui/webui/settings/chromeos/internet_handler.h" 49 #include "chrome/browser/ui/webui/settings/chromeos/internet_handler.h"
49 #else // !defined(OS_CHROMEOS) 50 #else // !defined(OS_CHROMEOS)
50 #include "chrome/browser/ui/webui/settings/settings_default_browser_handler.h" 51 #include "chrome/browser/ui/webui/settings/settings_default_browser_handler.h"
51 #include "chrome/browser/ui/webui/settings/settings_manage_profile_handler.h" 52 #include "chrome/browser/ui/webui/settings/settings_manage_profile_handler.h"
52 #include "chrome/browser/ui/webui/settings/system_handler.h" 53 #include "chrome/browser/ui/webui/settings/system_handler.h"
53 #endif // defined(OS_CHROMEOS) 54 #endif // defined(OS_CHROMEOS)
54 55
55 #if defined(USE_NSS_CERTS) 56 #if defined(USE_NSS_CERTS)
56 #include "chrome/browser/ui/webui/settings/certificates_handler.h" 57 #include "chrome/browser/ui/webui/settings/certificates_handler.h"
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
89 AddSettingsPageUIHandler(new SiteSettingsHandler(profile)); 90 AddSettingsPageUIHandler(new SiteSettingsHandler(profile));
90 AddSettingsPageUIHandler(new StartupPagesHandler(web_ui)); 91 AddSettingsPageUIHandler(new StartupPagesHandler(web_ui));
91 92
92 #if defined(OS_CHROMEOS) 93 #if defined(OS_CHROMEOS)
93 AddSettingsPageUIHandler(new chromeos::settings::AccessibilityHandler( 94 AddSettingsPageUIHandler(new chromeos::settings::AccessibilityHandler(
94 web_ui)); 95 web_ui));
95 AddSettingsPageUIHandler(new chromeos::settings::ChangePictureHandler()); 96 AddSettingsPageUIHandler(new chromeos::settings::ChangePictureHandler());
96 AddSettingsPageUIHandler(new chromeos::settings::CupsPrintersHandler(web_ui)); 97 AddSettingsPageUIHandler(new chromeos::settings::CupsPrintersHandler(web_ui));
97 AddSettingsPageUIHandler(new chromeos::settings::KeyboardHandler(web_ui)); 98 AddSettingsPageUIHandler(new chromeos::settings::KeyboardHandler(web_ui));
98 AddSettingsPageUIHandler(new chromeos::settings::PointerHandler()); 99 AddSettingsPageUIHandler(new chromeos::settings::PointerHandler());
100 AddSettingsPageUIHandler(new chromeos::settings::StorageHandler());
99 AddSettingsPageUIHandler(new chromeos::settings::InternetHandler()); 101 AddSettingsPageUIHandler(new chromeos::settings::InternetHandler());
100 #else 102 #else
101 AddSettingsPageUIHandler(new DefaultBrowserHandler(web_ui)); 103 AddSettingsPageUIHandler(new DefaultBrowserHandler(web_ui));
102 AddSettingsPageUIHandler(new ManageProfileHandler(profile)); 104 AddSettingsPageUIHandler(new ManageProfileHandler(profile));
103 AddSettingsPageUIHandler(new SystemHandler()); 105 AddSettingsPageUIHandler(new SystemHandler());
104 #endif 106 #endif
105 107
106 // Host must be derived from the visible URL, since this might be serving 108 // Host must be derived from the visible URL, since this might be serving
107 // either chrome://settings or chrome://md-settings. 109 // either chrome://settings or chrome://md-settings.
108 CHECK(url.GetOrigin() == GURL(chrome::kChromeUISettingsURL).GetOrigin() || 110 CHECK(url.GetOrigin() == GURL(chrome::kChromeUISettingsURL).GetOrigin() ||
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
161 UMA_HISTOGRAM_TIMES("Settings.LoadDocumentTime.MD", 163 UMA_HISTOGRAM_TIMES("Settings.LoadDocumentTime.MD",
162 base::Time::Now() - load_start_time_); 164 base::Time::Now() - load_start_time_);
163 } 165 }
164 166
165 void MdSettingsUI::DocumentOnLoadCompletedInMainFrame() { 167 void MdSettingsUI::DocumentOnLoadCompletedInMainFrame() {
166 UMA_HISTOGRAM_TIMES("Settings.LoadCompletedTime.MD", 168 UMA_HISTOGRAM_TIMES("Settings.LoadCompletedTime.MD",
167 base::Time::Now() - load_start_time_); 169 base::Time::Now() - load_start_time_);
168 } 170 }
169 171
170 } // namespace settings 172 } // namespace settings
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc ('k') | chromeos/chromeos_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698