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

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

Issue 5104002: Cleanup: Include browser.h -> ui/browser.h [Part 4]. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 10 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) 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/json/json_reader.h" 9 #include "base/json/json_reader.h"
10 #include "base/json/json_writer.h" 10 #include "base/json/json_writer.h"
11 #include "base/metrics/histogram.h" 11 #include "base/metrics/histogram.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"
16 #include "chrome/browser/browser_list.h"
17 #if defined(OS_CHROMEOS) 15 #if defined(OS_CHROMEOS)
18 #include "chrome/browser/chromeos/login/user_manager.h" 16 #include "chrome/browser/chromeos/login/user_manager.h"
19 #endif 17 #endif
20 #if defined(OS_MACOSX) 18 #if defined(OS_MACOSX)
21 #include "chrome/browser/cocoa/html_dialog_window_controller_cppsafe.h" 19 #include "chrome/browser/cocoa/html_dialog_window_controller_cppsafe.h"
22 #endif 20 #endif
23 #include "chrome/browser/dom_ui/dom_ui_util.h" 21 #include "chrome/browser/dom_ui/dom_ui_util.h"
24 #include "chrome/browser/platform_util.h" 22 #include "chrome/browser/platform_util.h"
25 #include "chrome/browser/prefs/pref_service.h" 23 #include "chrome/browser/prefs/pref_service.h"
26 #include "chrome/browser/profile.h" 24 #include "chrome/browser/profile.h"
27 #include "chrome/browser/renderer_host/render_view_host.h" 25 #include "chrome/browser/renderer_host/render_view_host.h"
28 #include "chrome/browser/sync/profile_sync_service.h" 26 #include "chrome/browser/sync/profile_sync_service.h"
29 #include "chrome/browser/tab_contents/tab_contents.h" 27 #include "chrome/browser/tab_contents/tab_contents.h"
28 #include "chrome/browser/ui/browser.h"
29 #include "chrome/browser/ui/browser_list.h"
30 #include "chrome/common/net/gaia/google_service_auth_error.h" 30 #include "chrome/common/net/gaia/google_service_auth_error.h"
31 #include "chrome/common/pref_names.h" 31 #include "chrome/common/pref_names.h"
32 #include "gfx/font.h" 32 #include "gfx/font.h"
33 #include "grit/locale_settings.h" 33 #include "grit/locale_settings.h"
34 34
35 // XPath expression for finding specific iframes. 35 // XPath expression for finding specific iframes.
36 static const wchar_t* kLoginIFrameXPath = L"//iframe[@id='login']"; 36 static const wchar_t* kLoginIFrameXPath = L"//iframe[@id='login']";
37 static const wchar_t* kChooseDataTypesIFrameXPath = 37 static const wchar_t* kChooseDataTypesIFrameXPath =
38 L"//iframe[@id='configure']"; 38 L"//iframe[@id='configure']";
39 static const wchar_t* kPassphraseIFrameXPath = 39 static const wchar_t* kPassphraseIFrameXPath =
(...skipping 655 matching lines...) Expand 10 before | Expand all | Expand 10 after
695 const std::string& mode) { 695 const std::string& mode) {
696 if (current_state_ == SyncSetupWizard::ENTER_PASSPHRASE) { 696 if (current_state_ == SyncSetupWizard::ENTER_PASSPHRASE) {
697 service_->SetPassphrase(passphrase, mode == std::string("enter")); 697 service_->SetPassphrase(passphrase, mode == std::string("enter"));
698 Advance(SyncSetupWizard::SETTING_UP); 698 Advance(SyncSetupWizard::SETTING_UP);
699 } else if (configuration_pending_) { 699 } else if (configuration_pending_) {
700 DCHECK_EQ(SyncSetupWizard::CREATE_PASSPHRASE, current_state_); 700 DCHECK_EQ(SyncSetupWizard::CREATE_PASSPHRASE, current_state_);
701 configuration_.secondary_passphrase = passphrase; 701 configuration_.secondary_passphrase = passphrase;
702 OnConfigurationComplete(); 702 OnConfigurationComplete();
703 } 703 }
704 } 704 }
OLDNEW
« no previous file with comments | « chrome/browser/sync/profile_sync_service_harness.cc ('k') | chrome/browser/sync/sync_setup_wizard_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698