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

Side by Side Diff: chrome/browser/sync/sync_setup_flow.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, 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
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_flow.h" 5 #include "chrome/browser/sync/sync_setup_flow.h"
6 6
7 #include "app/gfx/font_util.h" 7 #include "app/gfx/font_util.h"
8 #include "base/callback.h" 8 #include "base/callback.h"
9 #include "base/histogram.h" 9 #include "base/histogram.h"
10 #include "base/json/json_reader.h" 10 #include "base/json/json_reader.h"
11 #include "base/json/json_writer.h" 11 #include "base/json/json_writer.h"
12 #include "base/string_util.h" 12 #include "base/string_util.h"
13 #include "base/utf_string_conversions.h" 13 #include "base/utf_string_conversions.h"
14 #include "base/values.h" 14 #include "base/values.h"
15 #include "chrome/browser/browser.h" 15 #include "chrome/browser/browser.h"
16 #include "chrome/browser/browser_list.h" 16 #include "chrome/browser/browser_list.h"
17 #if defined(OS_MACOSX) 17 #if defined(OS_MACOSX)
18 #include "chrome/browser/cocoa/html_dialog_window_controller_cppsafe.h" 18 #include "chrome/browser/cocoa/html_dialog_window_controller_cppsafe.h"
19 #endif 19 #endif
20 #include "chrome/browser/dom_ui/dom_ui_util.h" 20 #include "chrome/browser/dom_ui/dom_ui_util.h"
21 #include "chrome/browser/platform_util.h" 21 #include "chrome/browser/platform_util.h"
22 #include "chrome/browser/pref_service.h" 22 #include "chrome/browser/prefs/pref_service.h"
23 #include "chrome/browser/profile.h" 23 #include "chrome/browser/profile.h"
24 #include "chrome/browser/renderer_host/render_view_host.h" 24 #include "chrome/browser/renderer_host/render_view_host.h"
25 #include "chrome/browser/sync/profile_sync_service.h" 25 #include "chrome/browser/sync/profile_sync_service.h"
26 #include "chrome/browser/sync/syncable/model_type.h" 26 #include "chrome/browser/sync/syncable/model_type.h"
27 #include "chrome/browser/tab_contents/tab_contents.h" 27 #include "chrome/browser/tab_contents/tab_contents.h"
28 #include "chrome/common/net/gaia/google_service_auth_error.h" 28 #include "chrome/common/net/gaia/google_service_auth_error.h"
29 #include "chrome/common/pref_names.h" 29 #include "chrome/common/pref_names.h"
30 #include "gfx/font.h" 30 #include "gfx/font.h"
31 #include "grit/locale_settings.h" 31 #include "grit/locale_settings.h"
32 32
(...skipping 475 matching lines...) Expand 10 before | Expand all | Expand 10 after
508 Browser* b = BrowserList::GetLastActive(); 508 Browser* b = BrowserList::GetLastActive();
509 if (b) { 509 if (b) {
510 b->BrowserShowHtmlDialog(flow, parent_window); 510 b->BrowserShowHtmlDialog(flow, parent_window);
511 } else { 511 } else {
512 delete flow; 512 delete flow;
513 return NULL; 513 return NULL;
514 } 514 }
515 #endif // defined(OS_MACOSX) 515 #endif // defined(OS_MACOSX)
516 return flow; 516 return flow;
517 } 517 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698