Add quick unlock Settings in options page

chrome/browser/ui/webui/options/options_ui.cc

 // Copyright (c) 2012 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/options/options_ui.h"
 
 #include <algorithm>
 #include <utility>
 #include <vector>
 
@@ skipping 45 matching lines @@
 #include "chrome/grit/locale_settings.h"
 #include "components/omnibox/browser/autocomplete_match.h"
 #include "components/omnibox/browser/autocomplete_result.h"
 #include "components/strings/grit/components_strings.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/url_data_source.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "content/public/browser/web_ui.h"
+#include "content/public/browser/web_ui_data_source.h"
 #include "grit/options_resources.h"
 #include "grit/theme_resources.h"
 #include "net/base/escape.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/webui/jstemplate_builder.h"
 #include "ui/base/webui/web_ui_util.h"
 #include "url/gurl.h"
 
 #if defined(ENABLE_SUPERVISED_USERS)
@@ skipping 32 matching lines @@
 #if BUILDFLAG(ENABLE_GOOGLE_NOW)
 #include "chrome/browser/ui/webui/options/geolocation_options_handler.h"
 #endif
 
 using content::RenderViewHost;
 
 namespace {
 
 const char kLocalizedStringsFile[] = "strings.js";
 const char kOptionsBundleJsFile[]  = "options_bundle.js";
+const char kCustomElementsHTMLPath[] = "custom_elements.html";
+const char kCustomElementsJSPath[] = "custom_elements.js";
+const char kPinKeyboardHTMLPath[] = "people_page/pin_keyboard.html";
+const char kPinKeyboardJSPath[] = "people_page/pin_keyboard.js";
+
+const char kPasswordPromptDialogHTMLPath[] =
+    "people_page/password_prompt_dialog.html";
+const char kPasswordPromptDialogJSPath[] =
+    "people_page/password_prompt_dialog.js";
+const char kLockStateBehaviorHTMLPath[] =
+    "people_page/lock_state_behavior.html";
+const char kLockStateBehaviorJSPath[] = "people_page/lock_state_behavior.js";
+const char kLockScreenHTMLPath[] = "people_page/lock_screen.html";
+const char kLockScreenJSPath[] = "people_page/lock_screen.js";
+const char kSetupPinHTMLPath[] = "people_page/setup_pin_dialog.html";
+const char kSetupPinJSPath[] = "people_page/setup_pin_dialog.js";
+const char kSettingsRouteHTMLPath[] = "route.html";
+const char kSettingsRouteJSPath[] = "route.js";
+const char kSettingsSharedCSSHTMLPath[] = "settings_shared_css.html";
+const char kSettingsVarsCSSHTMLPath[] = "settings_vars_css.html";
+const char kSettingsPrefsBehaviorHTMLPath[] = "prefs/prefs_behavior.html";
+const char kSettingsPrefsBehaviorJSPath[] = "prefs/prefs_behavior.js";
+const char kSettingsPrefsTypesHTMLPath[] = "prefs/prefs_types.html";
+const char kSettingsPrefsTypesJSPath[] = "prefs/prefs_types.js";
+
+
+// Creates a WebUIDataSource for chrome://settings-frame
+content::WebUIDataSource* CreateOptionsUIDataSource
+    (const base::DictionaryValue& localized_strings) {

[jdufault, 2016/08/15 19:21:18]

This formatting looks strange. Did you run git cl format?

[xiaoyinh(OOO Sep 11-29), 2016/08/16 17:33:43]

This part has been removed. Thanks!

+  content::WebUIDataSource* source =
+      content::WebUIDataSource::Create(chrome::kChromeUISettingsFrameHost);
+
+  source->AddLocalizedStrings(localized_strings);

[jdufault, 2016/08/15 19:21:18]

What changed so that this approach now works? Is the previous data source
implementation being used at the same time, or does this one replace it
entirely?

[xiaoyinh(OOO Sep 11-29), 2016/08/16 17:33:43]

I just found out that WebUIDataSource is a wrapper of URLDataSource. For the
same host,  I shouldn't use both WebUIDataSource and URLDataSource, one will be
overwritten by another. Since in option_ui.cc we originally use URLDataSource, I
will keep the new resources loading in URLDataSource as well. Thanks!

+  source->SetJsonPath(kLocalizedStringsFile);
+  source->SetDefaultResource(IDR_OPTIONS_HTML);

[jdufault, 2016/08/15 19:21:18]

Do you need this?

[xiaoyinh(OOO Sep 11-29), 2016/08/16 17:33:43]

This part has been removed. Thanks!

+  source->AddResourcePath(kOptionsBundleJsFile, IDR_OPTIONS_BUNDLE_JS);
+
+  source->AddResourcePath(kCustomElementsHTMLPath,
+                          IDR_CUSTOM_ELEMENTS_OPTIONS_HTML);
+  source->AddResourcePath(kCustomElementsJSPath,
+                          IDR_CUSTOM_ELEMENTS_OPTIONS_JS);
+  source->AddResourcePath(kPinKeyboardHTMLPath,
+                          IDR_OPTIONS_PIN_KEYBOARD_HTML);
+  source->AddResourcePath(kPinKeyboardJSPath,
+                          IDR_OPTIONS_PIN_KEYBOARD_JS);
+  source->AddResourcePath(kPasswordPromptDialogHTMLPath,
+                          IDR_OPTIONS_PASSWORD_PROMPT_DIALOG_HTML);
+  source->AddResourcePath(kPasswordPromptDialogJSPath,
+                          IDR_OPTIONS_PASSWORD_PROMPT_DIALOG_JS);
+  source->AddResourcePath(kLockStateBehaviorHTMLPath,
+                          IDR_OPTIONS_LOCK_STATE_BEHAVIOR_HTML);
+  source->AddResourcePath(kLockStateBehaviorJSPath,
+                          IDR_OPTIONS_LOCK_STATE_BEHAVIOR_JS);
+  source->AddResourcePath(kLockScreenHTMLPath,
+                          IDR_OPTIONS_LOCK_SCREEN_HTML);
+  source->AddResourcePath(kLockScreenJSPath,
+                          IDR_OPTIONS_LOCK_SCREEN_JS);
+  source->AddResourcePath(kSetupPinHTMLPath,
+                          IDR_OPTIONS_SETUP_PIN_DIALOG_HTML);
+  source->AddResourcePath(kSetupPinJSPath,
+                          IDR_OPTIONS_SETUP_PIN_DIALOG_JS);
+  source->AddResourcePath(kSettingsRouteHTMLPath,
+                          IDR_OPTIONS_ROUTE_HTML);
+  source->AddResourcePath(kSettingsRouteJSPath,
+                          IDR_OPTIONS_ROUTE_JS);
+  source->AddResourcePath(kSettingsSharedCSSHTMLPath,
+                          IDR_SETTINGS_SHARED_CSS_HTML);
+  source->AddResourcePath(kSettingsVarsCSSHTMLPath,
+                          IDR_SETTINGS_VARS_CSS_HTML);
+  source->AddResourcePath(kSettingsPrefsBehaviorHTMLPath,
+                          IDR_SETTINGS_PREFS_BEHAVIOR_HTML);
+  source->AddResourcePath(kSettingsPrefsBehaviorJSPath,
+                          IDR_SETTINGS_PREFS_BEHAVIOR_JS);
+  source->AddResourcePath(kSettingsPrefsTypesHTMLPath,
+                          IDR_SETTINGS_PREFS_TYPES_HTML);
+  source->AddResourcePath(kSettingsPrefsTypesJSPath,
+                          IDR_SETTINGS_PREFS_TYPES_JS);
+  return source;
+}
 
 }  // namespace
 
 namespace options {
 
 ////////////////////////////////////////////////////////////////////////////////
 //
 // OptionsUIHTMLSource
 //
 ////////////////////////////////////////////////////////////////////////////////
@@ skipping 230 matching lines @@
       new OptionsUIHTMLSource(localized_strings);
 
   // Set up the chrome://settings-frame/ source.
   Profile* profile = Profile::FromWebUI(web_ui);
   content::URLDataSource::Add(profile, html_source);
 
   // Set up the chrome://theme/ source.
   ThemeSource* theme = new ThemeSource(profile);
   content::URLDataSource::Add(profile, theme);
 
+  // Set uo the chrome://settings-frame/source

[jdufault, 2016/08/15 19:21:18]

uo -> up

[xiaoyinh(OOO Sep 11-29), 2016/08/16 17:33:43]

This part has been removed. Thanks!

+  content::WebUIDataSource::Add(profile,
+                                CreateOptionsUIDataSource(*localized_strings));
+
+  content::WebContents* contents = web_ui->GetWebContents();
+  extensions::TabHelper::CreateForWebContents(contents);
+
 #if defined(OS_CHROMEOS)
   // Set up the chrome://userimage/ source.
   chromeos::options::UserImageSource* user_image_source =
       new chromeos::options::UserImageSource();
   content::URLDataSource::Add(profile, user_image_source);
 
   pointer_device_observer_.reset(
       new chromeos::system::PointerDeviceObserver());
   pointer_device_observer_->AddObserver(browser_options_handler);
   pointer_device_observer_->AddObserver(pointer_handler);
@@ skipping 100 matching lines @@
   // Add only if handler's service is enabled.
   if (handler->IsEnabled()) {
     // Add handler to the list and also pass the ownership.
     web_ui()->AddMessageHandler(handler.release());
     handler_raw->GetLocalizedValues(localized_strings);
     handlers_.push_back(handler_raw);
   }
 }
 
 }  // namespace options