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

Side by Side Diff: chrome/browser/sync/sync_setup_flow.h

Issue 8507026: Fix infinite spin in auth dialog. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: For review. Created 9 years, 1 month 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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_SYNC_SYNC_SETUP_FLOW_H_ 5 #ifndef CHROME_BROWSER_SYNC_SYNC_SETUP_FLOW_H_
6 #define CHROME_BROWSER_SYNC_SYNC_SETUP_FLOW_H_ 6 #define CHROME_BROWSER_SYNC_SYNC_SETUP_FLOW_H_
7 #pragma once 7 #pragma once
8 8
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
109 FRIEND_TEST_ALL_PREFIXES(SyncSetupWizardTest, InvalidTransitions); 109 FRIEND_TEST_ALL_PREFIXES(SyncSetupWizardTest, InvalidTransitions);
110 FRIEND_TEST_ALL_PREFIXES(SyncSetupWizardTest, FullSuccessfulRunSetsPref); 110 FRIEND_TEST_ALL_PREFIXES(SyncSetupWizardTest, FullSuccessfulRunSetsPref);
111 FRIEND_TEST_ALL_PREFIXES(SyncSetupWizardTest, AbortedByPendingClear); 111 FRIEND_TEST_ALL_PREFIXES(SyncSetupWizardTest, AbortedByPendingClear);
112 FRIEND_TEST_ALL_PREFIXES(SyncSetupWizardTest, DiscreteRunGaiaLogin); 112 FRIEND_TEST_ALL_PREFIXES(SyncSetupWizardTest, DiscreteRunGaiaLogin);
113 FRIEND_TEST_ALL_PREFIXES(SyncSetupWizardTest, DiscreteRunChooseDataTypes); 113 FRIEND_TEST_ALL_PREFIXES(SyncSetupWizardTest, DiscreteRunChooseDataTypes);
114 FRIEND_TEST_ALL_PREFIXES(SyncSetupWizardTest, 114 FRIEND_TEST_ALL_PREFIXES(SyncSetupWizardTest,
115 DiscreteRunChooseDataTypesAbortedByPendingClear); 115 DiscreteRunChooseDataTypesAbortedByPendingClear);
116 FRIEND_TEST_ALL_PREFIXES(SyncSetupWizardTest, EnterPassphraseRequired); 116 FRIEND_TEST_ALL_PREFIXES(SyncSetupWizardTest, EnterPassphraseRequired);
117 FRIEND_TEST_ALL_PREFIXES(SyncSetupWizardTest, NonFatalError); 117 FRIEND_TEST_ALL_PREFIXES(SyncSetupWizardTest, NonFatalError);
118 FRIEND_TEST_ALL_PREFIXES(SyncSetupWizardTest, CrosAuthSetup); 118 FRIEND_TEST_ALL_PREFIXES(SyncSetupWizardTest, CrosAuthSetup);
119 FRIEND_TEST_ALL_PREFIXES(SyncSetupWizardTest, ShowErrorUIForPasswordTest);
120 FRIEND_TEST_ALL_PREFIXES(SyncSetupWizardTest, ShowErrorUIForPassphraseTest);
119 121
120 // Use static Run method to get an instance. 122 // Use static Run method to get an instance.
121 SyncSetupFlow(SyncSetupWizard::State start_state, 123 SyncSetupFlow(SyncSetupWizard::State start_state,
122 SyncSetupWizard::State end_state, 124 SyncSetupWizard::State end_state,
123 SyncSetupFlowContainer* container, 125 SyncSetupFlowContainer* container,
124 ProfileSyncService* service); 126 ProfileSyncService* service);
125 127
126 // Returns true if |this| should transition its state machine to |state| 128 // Returns true if |this| should transition its state machine to |state|
127 // based on |current_state_|, or false if that would be nonsense or is 129 // based on |current_state_|, or false if that would be nonsense or is
128 // a no-op. 130 // a no-op.
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
171 } 173 }
172 174
173 SyncSetupFlow* get_flow() { return flow_; } 175 SyncSetupFlow* get_flow() { return flow_; }
174 private: 176 private:
175 SyncSetupFlow* flow_; 177 SyncSetupFlow* flow_;
176 178
177 DISALLOW_COPY_AND_ASSIGN(SyncSetupFlowContainer); 179 DISALLOW_COPY_AND_ASSIGN(SyncSetupFlowContainer);
178 }; 180 };
179 181
180 #endif // CHROME_BROWSER_SYNC_SYNC_SETUP_FLOW_H_ 182 #endif // CHROME_BROWSER_SYNC_SYNC_SETUP_FLOW_H_
OLDNEW
« no previous file with comments | « chrome/browser/sync/profile_sync_service.h ('k') | chrome/browser/sync/sync_setup_wizard_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698