chrome/browser/ui/webui/sync_setup_handler.h - Issue 10698140: Remove "2" suffixes from options2 code.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: chrome/browser/ui/webui/sync_setup_handler.h

Issue 10698140: Remove "2" suffixes from options2 code. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix tests Created 8 years, 5 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

« chrome/browser/ui/webui/options2/web_intents_settings_handler.h ('K') | « chrome/browser/ui/webui/sync_promo/sync_promo_ui.cc ('k') | chrome/browser/ui/webui/uber/uber_ui.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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_WEBUI_SYNC_SETUP_HANDLER_H_	5 #ifndef CHROME_BROWSER_UI_WEBUI_SYNC_SETUP_HANDLER_H_

6 #define CHROME_BROWSER_UI_WEBUI_SYNC_SETUP_HANDLER_H_	6 #define CHROME_BROWSER_UI_WEBUI_SYNC_SETUP_HANDLER_H_

7	7

8 #include "base/gtest_prod_util.h"	8 #include "base/gtest_prod_util.h"

9 #include "base/memory/scoped_ptr.h"	9 #include "base/memory/scoped_ptr.h"

10 #include "chrome/browser/signin/signin_tracker.h"	10 #include "chrome/browser/signin/signin_tracker.h"

11 #include "chrome/browser/ui/webui/options2/options_ui2.h"	11 #include "chrome/browser/ui/webui/options2/options_ui.h"

12 #include "chrome/browser/ui/webui/signin/login_ui_service.h"	12 #include "chrome/browser/ui/webui/signin/login_ui_service.h"

13	13

14 class LoginUIService;	14 class LoginUIService;

15 class ProfileManager;	15 class ProfileManager;

16 class ProfileSyncService;	16 class ProfileSyncService;

17 class SigninManager;	17 class SigninManager;

18	18

19 class SyncSetupHandler : public options2::OptionsPageUIHandler,	19 class SyncSetupHandler : public options2::OptionsPageUIHandler,

20 public SigninTracker::Observer,	20 public SigninTracker::Observer,

21 public LoginUIService::LoginUI {	21 public LoginUIService::LoginUI {

(...skipping 167 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
189 GoogleServiceAuthError last_signin_error_;	189 GoogleServiceAuthError last_signin_error_;

190	190

191 // When setup starts with login UI, retry login if signing in failed.	191 // When setup starts with login UI, retry login if signing in failed.

192 // When setup starts without login UI, do not retry login and fail.	192 // When setup starts without login UI, do not retry login and fail.

193 bool retry_on_signin_failure_;	193 bool retry_on_signin_failure_;

194	194

195 DISALLOW_COPY_AND_ASSIGN(SyncSetupHandler);	195 DISALLOW_COPY_AND_ASSIGN(SyncSetupHandler);

196 };	196 };

197	197

198 #endif // CHROME_BROWSER_UI_WEBUI_SYNC_SETUP_HANDLER_H_	198 #endif // CHROME_BROWSER_UI_WEBUI_SYNC_SETUP_HANDLER_H_

OLD	NEW