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

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

Issue 2029263002: [MD Settings] Add feature to enable md-settings by default. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix URL CHECK statement. (Use URL, not Host) Created 4 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/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
11 #include "base/feature_list.h"
11 #include "base/metrics/histogram_macros.h" 12 #include "base/metrics/histogram_macros.h"
12 #include "chrome/browser/profiles/profile.h" 13 #include "chrome/browser/profiles/profile.h"
13 #include "chrome/browser/ui/webui/settings/about_handler.h" 14 #include "chrome/browser/ui/webui/settings/about_handler.h"
14 #include "chrome/browser/ui/webui/settings/appearance_handler.h" 15 #include "chrome/browser/ui/webui/settings/appearance_handler.h"
15 #include "chrome/browser/ui/webui/settings/downloads_handler.h" 16 #include "chrome/browser/ui/webui/settings/downloads_handler.h"
16 #include "chrome/browser/ui/webui/settings/font_handler.h" 17 #include "chrome/browser/ui/webui/settings/font_handler.h"
17 #include "chrome/browser/ui/webui/settings/languages_handler.h" 18 #include "chrome/browser/ui/webui/settings/languages_handler.h"
18 #include "chrome/browser/ui/webui/settings/md_settings_localized_strings_provide r.h" 19 #include "chrome/browser/ui/webui/settings/md_settings_localized_strings_provide r.h"
19 #include "chrome/browser/ui/webui/settings/people_handler.h" 20 #include "chrome/browser/ui/webui/settings/people_handler.h"
20 #include "chrome/browser/ui/webui/settings/profile_info_handler.h" 21 #include "chrome/browser/ui/webui/settings/profile_info_handler.h"
21 #include "chrome/browser/ui/webui/settings/reset_settings_handler.h" 22 #include "chrome/browser/ui/webui/settings/reset_settings_handler.h"
22 #include "chrome/browser/ui/webui/settings/search_engines_handler.h" 23 #include "chrome/browser/ui/webui/settings/search_engines_handler.h"
23 #include "chrome/browser/ui/webui/settings/settings_clear_browsing_data_handler. h" 24 #include "chrome/browser/ui/webui/settings/settings_clear_browsing_data_handler. h"
24 #include "chrome/browser/ui/webui/settings/settings_media_devices_selection_hand ler.h" 25 #include "chrome/browser/ui/webui/settings/settings_media_devices_selection_hand ler.h"
25 #include "chrome/browser/ui/webui/settings/settings_page_ui_handler.h" 26 #include "chrome/browser/ui/webui/settings/settings_page_ui_handler.h"
26 #include "chrome/browser/ui/webui/settings/settings_startup_pages_handler.h" 27 #include "chrome/browser/ui/webui/settings/settings_startup_pages_handler.h"
27 #include "chrome/browser/ui/webui/settings/site_settings_handler.h" 28 #include "chrome/browser/ui/webui/settings/site_settings_handler.h"
29 #include "chrome/common/chrome_features.h"
28 #include "chrome/common/url_constants.h" 30 #include "chrome/common/url_constants.h"
29 #include "content/public/browser/web_contents.h" 31 #include "content/public/browser/web_contents.h"
30 #include "content/public/browser/web_ui.h" 32 #include "content/public/browser/web_ui.h"
31 #include "content/public/browser/web_ui_data_source.h" 33 #include "content/public/browser/web_ui_data_source.h"
32 #include "grit/settings_resources.h" 34 #include "grit/settings_resources.h"
33 #include "grit/settings_resources_map.h" 35 #include "grit/settings_resources_map.h"
34 36
35 #if defined(OS_CHROMEOS) 37 #if defined(OS_CHROMEOS)
36 #include "chrome/browser/ui/webui/settings/chromeos/change_picture_handler.h" 38 #include "chrome/browser/ui/webui/settings/chromeos/change_picture_handler.h"
37 #include "chrome/browser/ui/webui/settings/chromeos/device_keyboard_handler.h" 39 #include "chrome/browser/ui/webui/settings/chromeos/device_keyboard_handler.h"
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 77
76 #if defined(OS_CHROMEOS) 78 #if defined(OS_CHROMEOS)
77 AddSettingsPageUIHandler(new chromeos::settings::ChangePictureHandler()); 79 AddSettingsPageUIHandler(new chromeos::settings::ChangePictureHandler());
78 AddSettingsPageUIHandler(new chromeos::settings::KeyboardHandler(web_ui)); 80 AddSettingsPageUIHandler(new chromeos::settings::KeyboardHandler(web_ui));
79 #else 81 #else
80 AddSettingsPageUIHandler(new DefaultBrowserHandler(web_ui)); 82 AddSettingsPageUIHandler(new DefaultBrowserHandler(web_ui));
81 AddSettingsPageUIHandler(new ManageProfileHandler(profile)); 83 AddSettingsPageUIHandler(new ManageProfileHandler(profile));
82 AddSettingsPageUIHandler(new SystemHandler()); 84 AddSettingsPageUIHandler(new SystemHandler());
83 #endif 85 #endif
84 86
87 // Host must be derived from the visible URL, since this might be serving
88 // either chrome://settings or chrome://md-settings.
89 const GURL url = web_ui->GetWebContents()->GetVisibleURL();
90 CHECK(url.GetOrigin() == GURL(chrome::kChromeUISettingsURL).GetOrigin() ||
91 url.GetOrigin() == GURL(chrome::kChromeUIMdSettingsURL).GetOrigin());
85 content::WebUIDataSource* html_source = 92 content::WebUIDataSource* html_source =
86 content::WebUIDataSource::Create(chrome::kChromeUIMdSettingsHost); 93 content::WebUIDataSource::Create(url.host());
87 94
88 #if defined(OS_CHROMEOS) 95 #if defined(OS_CHROMEOS)
89 chromeos::settings::EasyUnlockSettingsHandler* easy_unlock_handler = 96 chromeos::settings::EasyUnlockSettingsHandler* easy_unlock_handler =
90 chromeos::settings::EasyUnlockSettingsHandler::Create(html_source, 97 chromeos::settings::EasyUnlockSettingsHandler::Create(html_source,
91 profile); 98 profile);
92 if (easy_unlock_handler) 99 if (easy_unlock_handler)
93 AddSettingsPageUIHandler(easy_unlock_handler); 100 AddSettingsPageUIHandler(easy_unlock_handler);
94 #endif 101 #endif
95 102
96 AddSettingsPageUIHandler(AboutHandler::Create(html_source, profile)); 103 AddSettingsPageUIHandler(AboutHandler::Create(html_source, profile));
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
131 UMA_HISTOGRAM_TIMES("Settings.LoadDocumentTime.MD", 138 UMA_HISTOGRAM_TIMES("Settings.LoadDocumentTime.MD",
132 base::Time::Now() - load_start_time_); 139 base::Time::Now() - load_start_time_);
133 } 140 }
134 141
135 void MdSettingsUI::DocumentOnLoadCompletedInMainFrame() { 142 void MdSettingsUI::DocumentOnLoadCompletedInMainFrame() {
136 UMA_HISTOGRAM_TIMES("Settings.LoadCompletedTime.MD", 143 UMA_HISTOGRAM_TIMES("Settings.LoadCompletedTime.MD",
137 base::Time::Now() - load_start_time_); 144 base::Time::Now() - load_start_time_);
138 } 145 }
139 146
140 } // namespace settings 147 } // namespace settings
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc ('k') | chrome/browser/ui/webui/uber/uber_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698