Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(59)

Side by Side Diff: chrome/browser/ui/sync/one_click_signin_helper.h

Issue 22253010: Fix unwanted sign in to Chrome when the user signs in to another service. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Back to patch 7 + style fix Created 7 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_UI_SYNC_ONE_CLICK_SIGNIN_HELPER_H_ 5 #ifndef CHROME_BROWSER_UI_SYNC_ONE_CLICK_SIGNIN_HELPER_H_
6 #define CHROME_BROWSER_UI_SYNC_ONE_CLICK_SIGNIN_HELPER_H_ 6 #define CHROME_BROWSER_UI_SYNC_ONE_CLICK_SIGNIN_HELPER_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/gtest_prod_util.h" 10 #include "base/gtest_prod_util.h"
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
126 friend class content::WebContentsUserData<OneClickSigninHelper>; 126 friend class content::WebContentsUserData<OneClickSigninHelper>;
127 friend class OneClickSigninHelperTest; 127 friend class OneClickSigninHelperTest;
128 FRIEND_TEST_ALL_PREFIXES(OneClickSigninHelperTest, 128 FRIEND_TEST_ALL_PREFIXES(OneClickSigninHelperTest,
129 ShowInfoBarUIThreadIncognito); 129 ShowInfoBarUIThreadIncognito);
130 FRIEND_TEST_ALL_PREFIXES(OneClickSigninHelperTest, 130 FRIEND_TEST_ALL_PREFIXES(OneClickSigninHelperTest,
131 SigninFromWebstoreWithConfigSyncfirst); 131 SigninFromWebstoreWithConfigSyncfirst);
132 FRIEND_TEST_ALL_PREFIXES(OneClickSigninHelperTest, 132 FRIEND_TEST_ALL_PREFIXES(OneClickSigninHelperTest,
133 ShowSigninBubbleAfterSigninComplete); 133 ShowSigninBubbleAfterSigninComplete);
134 FRIEND_TEST_ALL_PREFIXES(OneClickSigninHelperTest, SigninCancelled); 134 FRIEND_TEST_ALL_PREFIXES(OneClickSigninHelperTest, SigninCancelled);
135 FRIEND_TEST_ALL_PREFIXES(OneClickSigninHelperTest, SigninFailed); 135 FRIEND_TEST_ALL_PREFIXES(OneClickSigninHelperTest, SigninFailed);
136 FRIEND_TEST_ALL_PREFIXES(OneClickSigninHelperTest,
137 CleanTransientStateOnNavigate);
136 FRIEND_TEST_ALL_PREFIXES(OneClickSigninHelperIOTest, CanOfferOnIOThread); 138 FRIEND_TEST_ALL_PREFIXES(OneClickSigninHelperIOTest, CanOfferOnIOThread);
137 FRIEND_TEST_ALL_PREFIXES(OneClickSigninHelperIOTest, 139 FRIEND_TEST_ALL_PREFIXES(OneClickSigninHelperIOTest,
138 CanOfferOnIOThreadIncognito); 140 CanOfferOnIOThreadIncognito);
139 FRIEND_TEST_ALL_PREFIXES(OneClickSigninHelperIOTest, 141 FRIEND_TEST_ALL_PREFIXES(OneClickSigninHelperIOTest,
140 CanOfferOnIOThreadNoIOData); 142 CanOfferOnIOThreadNoIOData);
141 FRIEND_TEST_ALL_PREFIXES(OneClickSigninHelperIOTest, 143 FRIEND_TEST_ALL_PREFIXES(OneClickSigninHelperIOTest,
142 CanOfferOnIOThreadBadURL); 144 CanOfferOnIOThreadBadURL);
143 FRIEND_TEST_ALL_PREFIXES(OneClickSigninHelperIOTest, 145 FRIEND_TEST_ALL_PREFIXES(OneClickSigninHelperIOTest,
144 CanOfferOnIOThreadReferrer); 146 CanOfferOnIOThreadReferrer);
145 FRIEND_TEST_ALL_PREFIXES(OneClickSigninHelperIOTest, 147 FRIEND_TEST_ALL_PREFIXES(OneClickSigninHelperIOTest,
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
262 // Allows unittests to avoid accessing the ResourceContext for clearing a 264 // Allows unittests to avoid accessing the ResourceContext for clearing a
263 // pending e-mail. 265 // pending e-mail.
264 bool do_not_clear_pending_email_; 266 bool do_not_clear_pending_email_;
265 267
266 base::WeakPtrFactory<OneClickSigninHelper> weak_pointer_factory_; 268 base::WeakPtrFactory<OneClickSigninHelper> weak_pointer_factory_;
267 269
268 DISALLOW_COPY_AND_ASSIGN(OneClickSigninHelper); 270 DISALLOW_COPY_AND_ASSIGN(OneClickSigninHelper);
269 }; 271 };
270 272
271 #endif // CHROME_BROWSER_UI_SYNC_ONE_CLICK_SIGNIN_HELPER_H_ 273 #endif // CHROME_BROWSER_UI_SYNC_ONE_CLICK_SIGNIN_HELPER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698