chrome/browser/signin/signin_ui_util.cc - Issue 1381633002: Cleanup: IWYU for browser_navigator.h and browser_navigator_params.h.

Side by Side Diff: chrome/browser/signin/signin_ui_util.cc

Issue 1381633002: Cleanup: IWYU for browser_navigator.h and browser_navigator_params.h. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase, fix merge conflict Created 5 years, 2 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

« no previous file with comments | « chrome/browser/sessions/session_restore_browsertest.cc ('k') | chrome/browser/ssl/ssl_browser_tests.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2013 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/signin/signin_ui_util.h"	5 #include "chrome/browser/signin/signin_ui_util.h"

6	6

7 #include "base/prefs/pref_service.h"	7 #include "base/prefs/pref_service.h"

8 #include "base/strings/sys_string_conversions.h"	8 #include "base/strings/sys_string_conversions.h"

9 #include "base/strings/utf_string_conversions.h"	9 #include "base/strings/utf_string_conversions.h"

10 #include "chrome/browser/profiles/profile.h"	10 #include "chrome/browser/profiles/profile.h"

11 #include "chrome/browser/signin/account_tracker_service_factory.h"	11 #include "chrome/browser/signin/account_tracker_service_factory.h"

12 #include "chrome/browser/signin/signin_error_controller_factory.h"	12 #include "chrome/browser/signin/signin_error_controller_factory.h"

13 #include "chrome/browser/signin/signin_global_error.h"	13 #include "chrome/browser/signin/signin_global_error.h"

14 #include "chrome/browser/signin/signin_global_error_factory.h"	14 #include "chrome/browser/signin/signin_global_error_factory.h"

15 #include "chrome/browser/signin/signin_manager_factory.h"	15 #include "chrome/browser/signin/signin_manager_factory.h"

16 #include "chrome/browser/sync/profile_sync_service.h"	16 #include "chrome/browser/sync/profile_sync_service.h"

17 #include "chrome/browser/sync/profile_sync_service_factory.h"	17 #include "chrome/browser/sync/profile_sync_service_factory.h"

18 #include "chrome/browser/sync/sync_global_error.h"	18 #include "chrome/browser/sync/sync_global_error.h"

19 #include "chrome/browser/sync/sync_global_error_factory.h"	19 #include "chrome/browser/sync/sync_global_error_factory.h"

20 #include "chrome/browser/ui/browser_navigator.h"	20 #include "chrome/browser/ui/browser_navigator.h"

	21 #include "chrome/browser/ui/browser_navigator_params.h"

21 #include "chrome/common/pref_names.h"	22 #include "chrome/common/pref_names.h"

22 #include "chrome/grit/chromium_strings.h"	23 #include "chrome/grit/chromium_strings.h"

23 #include "chrome/grit/generated_resources.h"	24 #include "chrome/grit/generated_resources.h"

24 #include "components/signin/core/browser/account_tracker_service.h"	25 #include "components/signin/core/browser/account_tracker_service.h"

25 #include "components/signin/core/browser/signin_manager.h"	26 #include "components/signin/core/browser/signin_manager.h"

26 #include "components/signin/core/common/profile_management_switches.h"	27 #include "components/signin/core/common/profile_management_switches.h"

27 #include "ui/base/l10n/l10n_util.h"	28 #include "ui/base/l10n/l10n_util.h"

28 #include "ui/gfx/font_list.h"	29 #include "ui/gfx/font_list.h"

29 #include "ui/gfx/text_elider.h"	30 #include "ui/gfx/text_elider.h"

30	31

(...skipping 153 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
184 std::string email = account_tracker->GetAccountInfo(account_id).email;	185 std::string email = account_tracker->GetAccountInfo(account_id).email;

185 if (email.empty()) {	186 if (email.empty()) {

186 DCHECK_EQ(AccountTrackerService::MIGRATION_NOT_STARTED,	187 DCHECK_EQ(AccountTrackerService::MIGRATION_NOT_STARTED,

187 account_tracker->GetMigrationState());	188 account_tracker->GetMigrationState());

188 return account_id;	189 return account_id;

189 }	190 }

190 return email;	191 return email;

191 }	192 }

192	193

193 } // namespace signin_ui_util	194 } // namespace signin_ui_util

OLD	NEW