Index: chrome/browser/ui/webui/signin/md_user_manager_ui.cc |
diff --git a/chrome/browser/ui/webui/signin/user_manager_ui.cc b/chrome/browser/ui/webui/signin/md_user_manager_ui.cc |
similarity index 40% |
copy from chrome/browser/ui/webui/signin/user_manager_ui.cc |
copy to chrome/browser/ui/webui/signin/md_user_manager_ui.cc |
index 477e43163e7bef20b85da54fe648bcb42d8fbdb9..6e776aebd36aa0105d2c94913ea5df15f39639c5 100644 |
--- a/chrome/browser/ui/webui/signin/user_manager_ui.cc |
+++ b/chrome/browser/ui/webui/signin/md_user_manager_ui.cc |
@@ -1,31 +1,33 @@ |
-// Copyright 2013 The Chromium Authors. All rights reserved. |
+// Copyright 2016 The Chromium Authors. All rights reserved. |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#include "chrome/browser/ui/webui/signin/user_manager_ui.h" |
+#include "chrome/browser/ui/webui/signin/md_user_manager_ui.h" |
+ |
+#include <string> |
#include "base/values.h" |
#include "chrome/browser/browser_process.h" |
#include "chrome/browser/profiles/profile.h" |
+#include "chrome/browser/ui/webui/signin/signin_create_profile_handler.h" |
#include "chrome/browser/ui/webui/signin/user_manager_screen_handler.h" |
#include "chrome/browser/ui/webui/theme_source.h" |
#include "chrome/common/url_constants.h" |
#include "content/public/browser/web_ui.h" |
#include "content/public/browser/web_ui_data_source.h" |
#include "grit/browser_resources.h" |
+#include "grit/settings_resources.h" |
#include "ui/base/resource/resource_bundle.h" |
#include "ui/base/webui/web_ui_util.h" |
-// JS file names. |
-const char kStringsJSPath[] = "strings.js"; |
-const char kUserManagerJSPath[] = "user_manager.js"; |
- |
-UserManagerUI::UserManagerUI(content::WebUI* web_ui) |
- : WebUIController(web_ui) { |
+MDUserManagerUI::MDUserManagerUI(content::WebUI* web_ui) |
+ : WebUIController(web_ui) { |
// The web_ui object takes ownership of the handler, and will |
// destroy it when it (the WebUI) is destroyed. |
user_manager_screen_handler_ = new UserManagerScreenHandler(); |
+ signin_create_profile_handler_ = new SigninCreateProfileHandler(); |
web_ui->AddMessageHandler(user_manager_screen_handler_); |
+ web_ui->AddMessageHandler(signin_create_profile_handler_); |
base::DictionaryValue localized_strings; |
GetLocalizedStrings(&localized_strings); |
@@ -41,25 +43,54 @@ UserManagerUI::UserManagerUI(content::WebUI* web_ui) |
#endif |
} |
-UserManagerUI::~UserManagerUI() { |
-} |
+MDUserManagerUI::~MDUserManagerUI() {} |
-content::WebUIDataSource* UserManagerUI::CreateUIDataSource( |
+content::WebUIDataSource* MDUserManagerUI::CreateUIDataSource( |
const base::DictionaryValue& localized_strings) { |
content::WebUIDataSource* source = |
- content::WebUIDataSource::Create(chrome::kChromeUIUserManagerHost); |
+ content::WebUIDataSource::Create(chrome::kChromeUIMDUserManagerHost); |
source->AddLocalizedStrings(localized_strings); |
- source->SetJsonPath(kStringsJSPath); |
+ source->SetJsonPath("strings.js"); |
- source->SetDefaultResource(IDR_USER_MANAGER_HTML); |
- source->AddResourcePath(kUserManagerJSPath, IDR_USER_MANAGER_JS); |
+ source->AddResourcePath("control_bar.css", IDR_MD_CONTROL_BAR_CSS); |
+ source->AddResourcePath("control_bar.html", IDR_MD_CONTROL_BAR_HTML); |
+ source->AddResourcePath("control_bar.js", IDR_MD_CONTROL_BAR_JS); |
+ source->AddResourcePath("create_profile.css", IDR_MD_CREATE_PROFILE_CSS); |
+ source->AddResourcePath("create_profile.html", IDR_MD_CREATE_PROFILE_HTML); |
+ source->AddResourcePath("create_profile.js", IDR_MD_CREATE_PROFILE_JS); |
+ source->AddResourcePath("profile_api.html", IDR_MD_PROFILE_API_HTML); |
+ source->AddResourcePath("profile_api.js", IDR_MD_PROFILE_API_JS); |
+ source->AddResourcePath("strings.html", IDR_MD_USER_MANAGER_STRINGS_HTML); |
+ source->AddResourcePath("supervised_user_learn_more.css", |
+ IDR_MD_SUPERVISED_USER_LEARN_MORE_CSS); |
+ source->AddResourcePath("supervised_user_learn_more.html", |
+ IDR_MD_SUPERVISED_USER_LEARN_MORE_HTML); |
+ source->AddResourcePath("supervised_user_learn_more.js", |
+ IDR_MD_SUPERVISED_USER_LEARN_MORE_JS); |
+ source->AddResourcePath("user_manager.css", IDR_MD_USER_MANAGER_CSS); |
+ source->AddResourcePath("user_manager.js", IDR_MD_USER_MANAGER_JS); |
+ source->AddResourcePath("user_manager_pages.css", |
+ IDR_MD_USER_MANAGER_PAGES_CSS); |
+ source->AddResourcePath("user_manager_pages.html", |
+ IDR_MD_USER_MANAGER_PAGES_HTML); |
+ source->AddResourcePath("user_manager_pages.js", |
+ IDR_MD_USER_MANAGER_PAGES_JS); |
+ source->AddResourcePath("user_manager_tutorial.css", |
+ IDR_MD_USER_MANAGER_TUTORIAL_CSS); |
+ source->AddResourcePath("user_manager_tutorial.html", |
+ IDR_MD_USER_MANAGER_TUTORIAL_HTML); |
+ source->AddResourcePath("user_manager_tutorial.js", |
+ IDR_MD_USER_MANAGER_TUTORIAL_JS); |
+ |
+ source->SetDefaultResource(IDR_MD_USER_MANAGER_HTML); |
return source; |
} |
-void UserManagerUI::GetLocalizedStrings( |
+void MDUserManagerUI::GetLocalizedStrings( |
base::DictionaryValue* localized_strings) { |
user_manager_screen_handler_->GetLocalizedValues(localized_strings); |
+ signin_create_profile_handler_->GetLocalizedValues(localized_strings); |
const std::string& app_locale = g_browser_process->GetApplicationLocale(); |
webui::SetLoadTimeDataDefaults(app_locale, localized_strings); |
@@ -69,4 +100,3 @@ void UserManagerUI::GetLocalizedStrings( |
localized_strings->SetString("buildType", "chromium"); |
#endif |
} |
- |