Index: chrome/browser/ui/webui/md_settings_ui.cc |
diff --git a/chrome/browser/ui/webui/md_settings_ui.cc b/chrome/browser/ui/webui/md_settings_ui.cc |
index 4c24d7f1a275d82fb57f36fbeabfc4585cb0bd25..f63ac01c43a403bb42ef2870986dc8179d305295 100644 |
--- a/chrome/browser/ui/webui/md_settings_ui.cc |
+++ b/chrome/browser/ui/webui/md_settings_ui.cc |
@@ -7,6 +7,8 @@ |
#include <string> |
#include "base/values.h" |
+#include "chrome/browser/profiles/profile.h" |
+#include "chrome/browser/ui/webui/options/core_options_handler.h" |
#include "chrome/common/url_constants.h" |
#include "chrome/grit/generated_resources.h" |
#include "content/public/browser/web_contents.h" |
@@ -16,8 +18,27 @@ |
#include "grit/settings_resources.h" |
#include "grit/settings_resources_map.h" |
+#if defined(OS_CHROMEOS) |
+#include "chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.h" |
+#endif |
+ |
MdSettingsUI::MdSettingsUI(content::WebUI* web_ui) |
: content::WebUIController(web_ui) { |
+ // TODO(jlklein): Remove handler logic once settingsPrivate is ready. |
+ #if defined(OS_CHROMEOS) |
+ core_handler_ = new chromeos::options::CoreChromeOSOptionsHandler(); |
+ #else |
+ core_handler_ = new options::CoreOptionsHandler(); |
+ #endif |
+ |
+ core_handler_->set_handlers_host(this); |
+ scoped_ptr<options::OptionsPageUIHandler> handler(core_handler_); |
+ DCHECK(handler.get()); |
+ if (handler->IsEnabled()) { |
+ web_ui->AddMessageHandler(handler.release()); |
+ } |
+ |
Kyle Horimoto
2015/03/19 22:42:11
nit: Remove extra newline.
Jeremy Klein
2015/03/19 23:04:21
Done.
|
+ |
content::WebUIDataSource* html_source = |
content::WebUIDataSource::Create(chrome::kChromeUIMdSettingsHost); |
@@ -36,3 +57,13 @@ MdSettingsUI::MdSettingsUI(content::WebUI* web_ui) |
MdSettingsUI::~MdSettingsUI() { |
} |
+ |
+void MdSettingsUI::InitializeHandlers() { |
+ Profile* profile = Profile::FromWebUI(web_ui()); |
+ DCHECK(!profile->IsOffTheRecord() || profile->IsGuestSession()); |
+ |
+ core_handler_->InitializeHandler(); |
+ core_handler_->InitializePage(); |
+} |
+ |
+void MdSettingsUI::OnFinishedLoading() {} |