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

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

Issue 471023003: Make sure the new confirmation bubble is always shown upon signin (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased Created 6 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 | Annotate | Revision Log
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_SYNC_STARTER_H_ 5 #ifndef CHROME_BROWSER_UI_SYNC_ONE_CLICK_SIGNIN_SYNC_STARTER_H_
6 #define CHROME_BROWSER_UI_SYNC_ONE_CLICK_SIGNIN_SYNC_STARTER_H_ 6 #define CHROME_BROWSER_UI_SYNC_ONE_CLICK_SIGNIN_SYNC_STARTER_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/callback_forward.h" 10 #include "base/callback_forward.h"
(...skipping 200 matching lines...) Expand 10 before | Expand all | Expand 10 after
211 void ShowSettingsPageInWebContents(content::WebContents* contents, 211 void ShowSettingsPageInWebContents(content::WebContents* contents,
212 const std::string& sub_page); 212 const std::string& sub_page);
213 213
214 // Shows the post-signin confirmation bubble. If |custom_message| is empty, 214 // Shows the post-signin confirmation bubble. If |custom_message| is empty,
215 // the default "You are signed in" message is displayed. 215 // the default "You are signed in" message is displayed.
216 void DisplayFinalConfirmationBubble(const base::string16& custom_message); 216 void DisplayFinalConfirmationBubble(const base::string16& custom_message);
217 217
218 // Loads the |continue_url_| in the current tab. 218 // Loads the |continue_url_| in the current tab.
219 void LoadContinueUrl(); 219 void LoadContinueUrl();
220 220
221 // Sets/gets the start sync mode. Called by SigninDialogDelegate to override
222 // the start sync mode if needed.
223 void SetStartSyncMode(StartSyncMode start_mode);
224 StartSyncMode GetStartSyncMode();
225
226 Profile* profile_; 221 Profile* profile_;
227 Browser* browser_; 222 Browser* browser_;
228 scoped_ptr<SigninTracker> signin_tracker_; 223 scoped_ptr<SigninTracker> signin_tracker_;
229 StartSyncMode start_mode_; 224 StartSyncMode start_mode_;
230 chrome::HostDesktopType desktop_type_; 225 chrome::HostDesktopType desktop_type_;
231 bool force_same_tab_navigation_; 226 bool force_same_tab_navigation_;
232 ConfirmationRequired confirmation_required_; 227 ConfirmationRequired confirmation_required_;
233 GURL continue_url_; 228 GURL continue_url_;
234 229
235 // Callback executed when sync setup succeeds or fails. 230 // Callback executed when sync setup succeeds or fails.
236 Callback sync_setup_completed_callback_; 231 Callback sync_setup_completed_callback_;
237 232
238 #if defined(ENABLE_CONFIGURATION_POLICY) 233 #if defined(ENABLE_CONFIGURATION_POLICY)
239 // Policy credentials we keep while determining whether to create 234 // Policy credentials we keep while determining whether to create
240 // a new profile for an enterprise user or not. 235 // a new profile for an enterprise user or not.
241 std::string dm_token_; 236 std::string dm_token_;
242 std::string client_id_; 237 std::string client_id_;
243 #endif 238 #endif
244 239
245 base::WeakPtrFactory<OneClickSigninSyncStarter> weak_pointer_factory_; 240 base::WeakPtrFactory<OneClickSigninSyncStarter> weak_pointer_factory_;
246 241
247 DISALLOW_COPY_AND_ASSIGN(OneClickSigninSyncStarter); 242 DISALLOW_COPY_AND_ASSIGN(OneClickSigninSyncStarter);
248 }; 243 };
249 244
250 245
251 #endif // CHROME_BROWSER_UI_SYNC_ONE_CLICK_SIGNIN_SYNC_STARTER_H_ 246 #endif // CHROME_BROWSER_UI_SYNC_ONE_CLICK_SIGNIN_SYNC_STARTER_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/sync/one_click_signin_helper.cc ('k') | chrome/browser/ui/sync/one_click_signin_sync_starter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698