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

Side by Side Diff: chrome/browser/sync/sync_setup_wizard.cc

Issue 3203008: Move prefs-related files under chrome/browser/ into a prefs/ subdir. (Closed) Base URL: http://src.chromium.org/git/chromium.git
Patch Set: Created 10 years, 3 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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 #include "chrome/browser/sync/sync_setup_wizard.h" 5 #include "chrome/browser/sync/sync_setup_wizard.h"
6 6
7 #include "app/resource_bundle.h" 7 #include "app/resource_bundle.h"
8 #include "base/message_loop.h" 8 #include "base/message_loop.h"
9 #include "base/singleton.h" 9 #include "base/singleton.h"
10 #include "chrome/browser/chrome_thread.h" 10 #include "chrome/browser/chrome_thread.h"
11 #include "chrome/browser/dom_ui/chrome_url_data_manager.h" 11 #include "chrome/browser/dom_ui/chrome_url_data_manager.h"
12 #include "chrome/browser/google_util.h" 12 #include "chrome/browser/google_util.h"
13 #include "chrome/browser/pref_service.h" 13 #include "chrome/browser/prefs/pref_service.h"
14 #include "chrome/browser/profile.h" 14 #include "chrome/browser/profile.h"
15 #include "chrome/browser/sync/profile_sync_service.h" 15 #include "chrome/browser/sync/profile_sync_service.h"
16 #include "chrome/browser/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/pref_names.h" 18 #include "chrome/common/pref_names.h"
19 #include "chrome/common/url_constants.h" 19 #include "chrome/common/url_constants.h"
20 #include "googleurl/src/gurl.h" 20 #include "googleurl/src/gurl.h"
21 #include "grit/app_resources.h" 21 #include "grit/app_resources.h"
22 #include "grit/browser_resources.h" 22 #include "grit/browser_resources.h"
23 #include "grit/chromium_strings.h" 23 #include "grit/chromium_strings.h"
(...skipping 243 matching lines...) Expand 10 before | Expand all | Expand 10 after
267 State result = FATAL_ERROR; 267 State result = FATAL_ERROR;
268 if (start_state == GAIA_LOGIN) { 268 if (start_state == GAIA_LOGIN) {
269 result = GAIA_SUCCESS; 269 result = GAIA_SUCCESS;
270 } else if (start_state == CHOOSE_DATA_TYPES) { 270 } else if (start_state == CHOOSE_DATA_TYPES) {
271 result = DONE; 271 result = DONE;
272 } 272 }
273 DCHECK_NE(FATAL_ERROR, result) << 273 DCHECK_NE(FATAL_ERROR, result) <<
274 "Invalid start state for discrete run: " << start_state; 274 "Invalid start state for discrete run: " << start_state;
275 return result; 275 return result;
276 } 276 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698