diff options
| author | xiyuan@chromium.org <xiyuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-15 21:42:33 +0000 |
|---|---|---|
| committer | xiyuan@chromium.org <xiyuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-15 21:42:33 +0000 |
| commit | 403f2e1e0ac2730f2475c71954f47bee3fa886a4 (patch) | |
| tree | 29638bfdf391a3a2afe1e295cb787dcfd9fb4fa5 /chrome/browser/ui/webui/options/options_ui.cc | |
| parent | c519295e83ab20eb42e58e40f28493df43d3d1c4 (diff) | |
| download | chromium_src-403f2e1e0ac2730f2475c71954f47bee3fa886a4.zip chromium_src-403f2e1e0ac2730f2475c71954f47bee3fa886a4.tar.gz chromium_src-403f2e1e0ac2730f2475c71954f47bee3fa886a4.tar.bz2 | |
Wire easy unlock settings UI
- Add API to get/set/clear the pairing info into user prefs;
- Add an onTurnFlowFinished event so that the app can clear its state;
- Extend EasyUnlockService to store pairing info and provide
turn-off flow support;
- Update settings UI to trigger turn off flow and observe
the turn-off flow status to show pending/error or dismiss when done;
- Add EasyUnlockToggleFlow to wrap api calls to server;
- Update OAuth2ApiFlow to support application/json content-type and
handle 204 as success;
BUG=397356,394640
Review URL: https://codereview.chromium.org/475483003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@290019 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/webui/options/options_ui.cc')
| -rw-r--r-- | chrome/browser/ui/webui/options/options_ui.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/chrome/browser/ui/webui/options/options_ui.cc b/chrome/browser/ui/webui/options/options_ui.cc index 14a49f3..4a703e2 100644 --- a/chrome/browser/ui/webui/options/options_ui.cc +++ b/chrome/browser/ui/webui/options/options_ui.cc @@ -30,6 +30,7 @@ #include "chrome/browser/ui/webui/options/cookies_view_handler.h" #include "chrome/browser/ui/webui/options/core_options_handler.h" #include "chrome/browser/ui/webui/options/create_profile_handler.h" +#include "chrome/browser/ui/webui/options/easy_unlock_handler.h" #include "chrome/browser/ui/webui/options/font_settings_handler.h" #include "chrome/browser/ui/webui/options/handler_options_handler.h" #include "chrome/browser/ui/webui/options/home_page_overlay_handler.h" @@ -273,6 +274,7 @@ OptionsUI::OptionsUI(content::WebUI* web_ui) AddOptionsPageUIHandler(localized_strings, new ContentSettingsHandler()); AddOptionsPageUIHandler(localized_strings, new CookiesViewHandler()); AddOptionsPageUIHandler(localized_strings, new CreateProfileHandler()); + AddOptionsPageUIHandler(localized_strings, new EasyUnlockHandler()); AddOptionsPageUIHandler(localized_strings, new FontSettingsHandler()); #if defined(ENABLE_GOOGLE_NOW) AddOptionsPageUIHandler(localized_strings, new GeolocationOptionsHandler()); |