diff options
author | chron@chromium.org <chron@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-19 18:44:19 +0000 |
---|---|---|
committer | chron@chromium.org <chron@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-19 18:44:19 +0000 |
commit | 99074c5d22fac9f990aebe5055ea0bf68aef7ad7 (patch) | |
tree | 0ec4b33ed7b0758221befa68e1bba2c6fec0010f /chrome/browser/browser_about_handler.cc | |
parent | 2313f55f13ee9f5d45f85a22f9e0459990aedc5a (diff) | |
download | chromium_src-99074c5d22fac9f990aebe5055ea0bf68aef7ad7.zip chromium_src-99074c5d22fac9f990aebe5055ea0bf68aef7ad7.tar.gz chromium_src-99074c5d22fac9f990aebe5055ea0bf68aef7ad7.tar.bz2 |
Switch to GoogleServiceAuthError struct instead of GaiaAuthError.
Remove CAPTCHA code from existing user controller and plumb into google
authenticator2.
TEST=Install ChromeOS build. Hit Captcha. Enter captcha.
BUG=50408
Review URL: http://codereview.chromium.org/3134009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56724 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_about_handler.cc')
-rw-r--r-- | chrome/browser/browser_about_handler.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/browser_about_handler.cc b/chrome/browser/browser_about_handler.cc index 381f7be..08dbb7e 100644 --- a/chrome/browser/browser_about_handler.cc +++ b/chrome/browser/browser_about_handler.cc @@ -29,7 +29,6 @@ #include "chrome/browser/chrome_thread.h" #include "chrome/browser/defaults.h" #include "chrome/browser/dom_ui/chrome_url_data_manager.h" -#include "chrome/browser/google_service_auth_error.h" #include "chrome/browser/memory_details.h" #include "chrome/browser/metrics/histogram_synchronizer.h" #include "chrome/browser/net/predictor_api.h" @@ -44,6 +43,7 @@ #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_version_info.h" #include "chrome/common/jstemplate_builder.h" +#include "chrome/common/net/gaia/google_service_auth_error.h" #include "chrome/common/pref_names.h" #include "chrome/common/render_messages.h" #include "chrome/common/url_constants.h" |