chrome/browser/sync/sync_setup_wizard.cc - Issue 279004: Made sync code build and pass unit tests on OS X.

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/sync/sync_setup_wizard.cc

Issue 279004: Made sync code build and pass unit tests on OS X. (Closed)

Patch Set: Fixed uninitialized var error. Created 11 years, 2 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

« no previous file with comments | « chrome/browser/sync/sync_setup_wizard.h ('k') | chrome/browser/sync/sync_setup_wizard_unittest.cc » ('j') | chrome/chrome.gyp » ('J')

OLD	NEW
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2006-2008 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 #ifdef CHROME_PERSONALIZATION	5 #ifdef CHROME_PERSONALIZATION

6	6

7 #include "chrome/browser/views/sync/sync_setup_wizard.h"	7 #include "chrome/browser/sync/sync_setup_wizard.h"

8	8

9 #include "app/resource_bundle.h"	9 #include "app/resource_bundle.h"

10 #include "base/message_loop.h"	10 #include "base/message_loop.h"

11 #include "chrome/common/pref_names.h"	11 #include "chrome/common/pref_names.h"

12 #include "chrome/common/pref_service.h"	12 #include "chrome/common/pref_service.h"

13 #include "chrome/browser/browser_process.h"	13 #include "chrome/browser/browser_process.h"

14 #include "chrome/browser/dom_ui/chrome_url_data_manager.h"	14 #include "chrome/browser/dom_ui/chrome_url_data_manager.h"

15 #include "chrome/browser/sync/profile_sync_service.h"	15 #include "chrome/browser/sync/profile_sync_service.h"

16 #include "chrome/browser/views/sync/sync_setup_flow.h"	16 #include "chrome/browser/sync/sync_setup_flow.h"

17 #include "chrome/common/jstemplate_builder.h"	17 #include "chrome/common/jstemplate_builder.h"

18 #include "chrome/common/url_constants.h"	18 #include "chrome/common/url_constants.h"

19 #include "grit/app_resources.h"	19 #include "grit/app_resources.h"

20 #include "grit/browser_resources.h"	20 #include "grit/browser_resources.h"

21	21

22 class SyncResourcesSource : public ChromeURLDataManager::DataSource {	22 class SyncResourcesSource : public ChromeURLDataManager::DataSource {

23 public:	23 public:

24 SyncResourcesSource()	24 SyncResourcesSource()

25 : DataSource(chrome::kSyncResourcesHost, MessageLoop::current()) {	25 : DataSource(chrome::kSyncResourcesHost, MessageLoop::current()) {

26 }	26 }

(...skipping 163 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
190 // static	190 // static

191 SyncSetupWizard::State SyncSetupWizard::GetEndStateForDiscreteRun(	191 SyncSetupWizard::State SyncSetupWizard::GetEndStateForDiscreteRun(

192 State start_state) {	192 State start_state) {

193 State result = start_state == GAIA_LOGIN ? GAIA_SUCCESS : DONE;	193 State result = start_state == GAIA_LOGIN ? GAIA_SUCCESS : DONE;

194 DCHECK_NE(DONE, result) <<	194 DCHECK_NE(DONE, result) <<

195 "Invalid start state for discrete run: " << start_state;	195 "Invalid start state for discrete run: " << start_state;

196 return result;	196 return result;

197 }	197 }

198	198

199 #endif // CHROME_PERSONALIZATION	199 #endif // CHROME_PERSONALIZATION

OLD	NEW