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

Side by Side Diff: chrome/browser/ui/webui/options/sync_setup_handler.cc

Issue 2345843003: [Sync] Merge //components/browser_sync into one directory. (Closed)
Patch Set: Address comment + rebase. Created 4 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/ui/webui/options/sync_setup_handler.h" 5 #include "chrome/browser/ui/webui/options/sync_setup_handler.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/bind_helpers.h" 10 #include "base/bind_helpers.h"
(...skipping 23 matching lines...) Expand all
34 #include "chrome/browser/ui/webui/profile_helper.h" 34 #include "chrome/browser/ui/webui/profile_helper.h"
35 #include "chrome/browser/ui/webui/signin/login_ui_service.h" 35 #include "chrome/browser/ui/webui/signin/login_ui_service.h"
36 #include "chrome/browser/ui/webui/signin/login_ui_service_factory.h" 36 #include "chrome/browser/ui/webui/signin/login_ui_service_factory.h"
37 #include "chrome/common/chrome_switches.h" 37 #include "chrome/common/chrome_switches.h"
38 #include "chrome/common/url_constants.h" 38 #include "chrome/common/url_constants.h"
39 #include "chrome/grit/chromium_strings.h" 39 #include "chrome/grit/chromium_strings.h"
40 #include "chrome/grit/generated_resources.h" 40 #include "chrome/grit/generated_resources.h"
41 #include "chrome/grit/locale_settings.h" 41 #include "chrome/grit/locale_settings.h"
42 #include "components/autofill/core/common/autofill_constants.h" 42 #include "components/autofill/core/common/autofill_constants.h"
43 #include "components/autofill/core/common/autofill_pref_names.h" 43 #include "components/autofill/core/common/autofill_pref_names.h"
44 #include "components/browser_sync/browser/profile_sync_service.h" 44 #include "components/browser_sync/profile_sync_service.h"
45 #include "components/google/core/browser/google_util.h" 45 #include "components/google/core/browser/google_util.h"
46 #include "components/prefs/pref_service.h" 46 #include "components/prefs/pref_service.h"
47 #include "components/signin/core/browser/signin_error_controller.h" 47 #include "components/signin/core/browser/signin_error_controller.h"
48 #include "components/signin/core/browser/signin_header_helper.h" 48 #include "components/signin/core/browser/signin_header_helper.h"
49 #include "components/signin/core/browser/signin_metrics.h" 49 #include "components/signin/core/browser/signin_metrics.h"
50 #include "components/signin/core/common/profile_management_switches.h" 50 #include "components/signin/core/common/profile_management_switches.h"
51 #include "components/strings/grit/components_strings.h" 51 #include "components/strings/grit/components_strings.h"
52 #include "components/sync/driver/sync_prefs.h" 52 #include "components/sync/driver/sync_prefs.h"
53 #include "content/public/browser/render_view_host.h" 53 #include "content/public/browser/render_view_host.h"
54 #include "content/public/browser/web_contents.h" 54 #include "content/public/browser/web_contents.h"
(...skipping 889 matching lines...) Expand 10 before | Expand all | Expand 10 after
944 page, args); 944 page, args);
945 945
946 // Make sure the tab used for the Gaia sign in does not cover the settings 946 // Make sure the tab used for the Gaia sign in does not cover the settings
947 // tab. 947 // tab.
948 FocusUI(); 948 FocusUI();
949 } 949 }
950 950
951 LoginUIService* SyncSetupHandler::GetLoginUIService() const { 951 LoginUIService* SyncSetupHandler::GetLoginUIService() const {
952 return LoginUIServiceFactory::GetForProfile(GetProfile()); 952 return LoginUIServiceFactory::GetForProfile(GetProfile());
953 } 953 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/options/password_manager_handler.cc ('k') | chrome/browser/ui/webui/settings/people_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698