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

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

Issue 6312156: Change includes of gfx/* to ui/gfx/* (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 10 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 | Annotate | Revision Log
« no previous file with comments | « chrome/browser/sync/sync_setup_flow.h ('k') | chrome/browser/sync/sync_setup_wizard.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #include "chrome/browser/sync/sync_setup_flow.h" 5 #include "chrome/browser/sync/sync_setup_flow.h"
6 6
7 #include "base/callback.h" 7 #include "base/callback.h"
8 #include "base/json/json_reader.h" 8 #include "base/json/json_reader.h"
9 #include "base/json/json_writer.h" 9 #include "base/json/json_writer.h"
10 #include "base/metrics/histogram.h" 10 #include "base/metrics/histogram.h"
11 #include "base/string_util.h" 11 #include "base/string_util.h"
12 #include "base/utf_string_conversions.h" 12 #include "base/utf_string_conversions.h"
13 #include "base/values.h" 13 #include "base/values.h"
14 #include "chrome/browser/dom_ui/web_ui_util.h" 14 #include "chrome/browser/dom_ui/web_ui_util.h"
15 #include "chrome/browser/platform_util.h" 15 #include "chrome/browser/platform_util.h"
16 #include "chrome/browser/prefs/pref_service.h" 16 #include "chrome/browser/prefs/pref_service.h"
17 #include "chrome/browser/profiles/profile.h" 17 #include "chrome/browser/profiles/profile.h"
18 #include "chrome/browser/renderer_host/render_view_host.h" 18 #include "chrome/browser/renderer_host/render_view_host.h"
19 #include "chrome/browser/sync/profile_sync_service.h" 19 #include "chrome/browser/sync/profile_sync_service.h"
20 #include "chrome/browser/tab_contents/tab_contents.h" 20 #include "chrome/browser/tab_contents/tab_contents.h"
21 #include "chrome/browser/ui/browser.h" 21 #include "chrome/browser/ui/browser.h"
22 #include "chrome/browser/ui/browser_dialogs.h" 22 #include "chrome/browser/ui/browser_dialogs.h"
23 #include "chrome/browser/ui/browser_list.h" 23 #include "chrome/browser/ui/browser_list.h"
24 #include "chrome/common/net/gaia/google_service_auth_error.h" 24 #include "chrome/common/net/gaia/google_service_auth_error.h"
25 #include "chrome/common/pref_names.h" 25 #include "chrome/common/pref_names.h"
26 #include "gfx/font.h"
27 #include "grit/locale_settings.h" 26 #include "grit/locale_settings.h"
28 #include "ui/base/l10n/l10n_font_util.h" 27 #include "ui/base/l10n/l10n_font_util.h"
28 #include "ui/gfx/font.h"
29 29
30 // XPath expression for finding specific iframes. 30 // XPath expression for finding specific iframes.
31 static const wchar_t* kLoginIFrameXPath = L"//iframe[@id='login']"; 31 static const wchar_t* kLoginIFrameXPath = L"//iframe[@id='login']";
32 static const wchar_t* kChooseDataTypesIFrameXPath = 32 static const wchar_t* kChooseDataTypesIFrameXPath =
33 L"//iframe[@id='configure']"; 33 L"//iframe[@id='configure']";
34 static const wchar_t* kPassphraseIFrameXPath = 34 static const wchar_t* kPassphraseIFrameXPath =
35 L"//iframe[@id='passphrase']"; 35 L"//iframe[@id='passphrase']";
36 static const wchar_t* kDoneIframeXPath = L"//iframe[@id='done']"; 36 static const wchar_t* kDoneIframeXPath = L"//iframe[@id='done']";
37 37
38 SyncConfiguration::SyncConfiguration() 38 SyncConfiguration::SyncConfiguration()
(...skipping 737 matching lines...) Expand 10 before | Expand all | Expand 10 after
776 DisablePasswordSync(service_); 776 DisablePasswordSync(service_);
777 } else if (option == "google") { 777 } else if (option == "google") {
778 // Implicit passphrase already set up. 778 // Implicit passphrase already set up.
779 Advance(SyncSetupWizard::DONE); 779 Advance(SyncSetupWizard::DONE);
780 } 780 }
781 } 781 }
782 782
783 void SyncSetupFlow::OnGoToDashboard() { 783 void SyncSetupFlow::OnGoToDashboard() {
784 BrowserList::GetLastActive()->OpenPrivacyDashboardTabAndActivate(); 784 BrowserList::GetLastActive()->OpenPrivacyDashboardTabAndActivate();
785 } 785 }
OLDNEW
« no previous file with comments | « chrome/browser/sync/sync_setup_flow.h ('k') | chrome/browser/sync/sync_setup_wizard.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698