diff options
| author | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-17 02:11:48 +0000 |
|---|---|---|
| committer | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-17 02:11:48 +0000 |
| commit | fc43868654630100e0f5dd7beef20464ea434679 (patch) | |
| tree | c3cb020b3b42959736480e33ef7c0c6ee050ccee /chrome/browser | |
| parent | 4593aa2be388ee1e028399d43e4e3f4d4491b5a2 (diff) | |
| download | chromium_src-fc43868654630100e0f5dd7beef20464ea434679.zip chromium_src-fc43868654630100e0f5dd7beef20464ea434679.tar.gz chromium_src-fc43868654630100e0f5dd7beef20464ea434679.tar.bz2 | |
[Sync] Replace TalkMediator*/MediatorThread* with PushClient
Streamline methods of PushClient and its Observer subclass.
Remove sync/protocol/service_constants.h and consolidate use of each
constant in one place. Remove duplicate constant in cloud print code.
BUG=76764
TEST=
TBR=estade@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10398051
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@137615 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
| -rw-r--r-- | chrome/browser/ui/webui/sync_setup_handler.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/chrome/browser/ui/webui/sync_setup_handler.cc b/chrome/browser/ui/webui/sync_setup_handler.cc index 47d3aa3..281fa3c 100644 --- a/chrome/browser/ui/webui/sync_setup_handler.cc +++ b/chrome/browser/ui/webui/sync_setup_handler.cc @@ -4,8 +4,8 @@ #include "chrome/browser/ui/webui/sync_setup_handler.h" -#include "base/bind.h" #include "base/basictypes.h" +#include "base/bind.h" #include "base/bind_helpers.h" #include "base/command_line.h" #include "base/compiler_specific.h" @@ -29,15 +29,14 @@ #include "chrome/browser/ui/webui/signin/login_ui_service_factory.h" #include "chrome/browser/ui/webui/sync_promo/sync_promo_ui.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/url_constants.h" #include "chrome/common/net/gaia/gaia_constants.h" +#include "chrome/common/url_constants.h" #include "content/public/browser/render_view_host.h" #include "content/public/browser/render_view_host_delegate.h" #include "content/public/browser/web_contents.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" -#include "sync/protocol/service_constants.h" #include "ui/base/l10n/l10n_util.h" using l10n_util::GetStringFUTF16; @@ -93,6 +92,8 @@ static const size_t kNumDataTypes = arraysize(kDataTypes); COMPILE_ASSERT(arraysize(kDataTypeNames) == arraysize(kDataTypes), kDataTypes_does_not_match_kDataTypeNames); +static const char kDefaultSigninDomain[] = "gmail.com"; + bool GetAuthData(const std::string& json, std::string* username, std::string* password, @@ -177,7 +178,7 @@ bool GetPassphrase(const std::string& json, std::string* passphrase) { string16 NormalizeUserName(const string16& user) { if (user.find_first_of(ASCIIToUTF16("@")) != string16::npos) return user; - return user + ASCIIToUTF16("@") + ASCIIToUTF16(DEFAULT_SIGNIN_DOMAIN); + return user + ASCIIToUTF16("@") + ASCIIToUTF16(kDefaultSigninDomain); } bool AreUserNamesEqual(const string16& user1, const string16& user2) { |