| Index: chrome/browser/ui/webui/settings/md_settings_ui.cc
|
| diff --git a/chrome/browser/ui/webui/settings/md_settings_ui.cc b/chrome/browser/ui/webui/settings/md_settings_ui.cc
|
| index e3a70bef3a740972d24be1056b7e2b7bdd104865..eb28b782557c90890a671593d175d0f9cd13db38 100644
|
| --- a/chrome/browser/ui/webui/settings/md_settings_ui.cc
|
| +++ b/chrome/browser/ui/webui/settings/md_settings_ui.cc
|
| @@ -40,6 +40,7 @@
|
| #include "chrome/browser/ui/webui/settings/chromeos/device_keyboard_handler.h"
|
| #include "chrome/browser/ui/webui/settings/chromeos/device_pointer_handler.h"
|
| #include "chrome/browser/ui/webui/settings/chromeos/easy_unlock_settings_handler.h"
|
| +#include "chrome/browser/ui/webui/settings/chromeos/note_handler.h"
|
| #else // !defined(OS_CHROMEOS)
|
| #include "chrome/browser/ui/webui/settings/settings_default_browser_handler.h"
|
| #include "chrome/browser/ui/webui/settings/settings_manage_profile_handler.h"
|
| @@ -59,6 +60,8 @@ MdSettingsUI::MdSettingsUI(content::WebUI* web_ui, const GURL& url)
|
| WebContentsObserver(web_ui->GetWebContents()) {
|
| Profile* profile = Profile::FromWebUI(web_ui);
|
| AddSettingsPageUIHandler(new AppearanceHandler(web_ui));
|
| + content::WebUIDataSource* html_source =
|
| + content::WebUIDataSource::Create(url.host());
|
|
|
| #if defined(USE_NSS_CERTS)
|
| AddSettingsPageUIHandler(new CertificatesHandler(false));
|
| @@ -83,6 +86,7 @@ MdSettingsUI::MdSettingsUI(content::WebUI* web_ui, const GURL& url)
|
| #if defined(OS_CHROMEOS)
|
| AddSettingsPageUIHandler(new chromeos::settings::ChangePictureHandler());
|
| AddSettingsPageUIHandler(new chromeos::settings::KeyboardHandler(web_ui));
|
| + AddSettingsPageUIHandler(new chromeos::settings::NoteHandler(html_source));
|
| AddSettingsPageUIHandler(new chromeos::settings::PointerHandler());
|
| #else
|
| AddSettingsPageUIHandler(new DefaultBrowserHandler(web_ui));
|
| @@ -95,9 +99,6 @@ MdSettingsUI::MdSettingsUI(content::WebUI* web_ui, const GURL& url)
|
| CHECK(url.GetOrigin() == GURL(chrome::kChromeUISettingsURL).GetOrigin() ||
|
| url.GetOrigin() == GURL(chrome::kChromeUIMdSettingsURL).GetOrigin());
|
|
|
| - content::WebUIDataSource* html_source =
|
| - content::WebUIDataSource::Create(url.host());
|
| -
|
| #if defined(OS_CHROMEOS)
|
| chromeos::settings::EasyUnlockSettingsHandler* easy_unlock_handler =
|
| chromeos::settings::EasyUnlockSettingsHandler::Create(html_source,
|
|
|