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

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

Issue 2911773002: Clean up unused grit header includes in chrome/ (Closed)
Patch Set: rebase Created 3 years, 6 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/search/local_ntp_source.cc ('k') | chrome/browser/sync/sync_ui_util.cc » ('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) 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/strings/sys_string_conversions.h" 7 #include "base/strings/sys_string_conversions.h"
8 #include "base/strings/utf_string_conversions.h" 8 #include "base/strings/utf_string_conversions.h"
9 #include "build/build_config.h" 9 #include "build/build_config.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_factory.h" 16 #include "chrome/browser/sync/profile_sync_service_factory.h"
17 #include "chrome/browser/ui/browser_navigator.h" 17 #include "chrome/browser/ui/browser_navigator.h"
18 #include "chrome/browser/ui/browser_navigator_params.h" 18 #include "chrome/browser/ui/browser_navigator_params.h"
19 #include "chrome/common/pref_names.h" 19 #include "chrome/common/pref_names.h"
20 #include "chrome/grit/chromium_strings.h"
21 #include "chrome/grit/generated_resources.h"
22 #include "components/browser_sync/profile_sync_service.h" 20 #include "components/browser_sync/profile_sync_service.h"
23 #include "components/prefs/pref_service.h" 21 #include "components/prefs/pref_service.h"
24 #include "components/signin/core/browser/account_tracker_service.h" 22 #include "components/signin/core/browser/account_tracker_service.h"
25 #include "components/signin/core/browser/signin_manager.h" 23 #include "components/signin/core/browser/signin_manager.h"
26 #include "components/signin/core/common/profile_management_switches.h" 24 #include "components/signin/core/common/profile_management_switches.h"
27 #include "components/strings/grit/components_strings.h"
28 #include "components/user_manager/user_manager.h" 25 #include "components/user_manager/user_manager.h"
29 #include "ui/base/l10n/l10n_util.h" 26 #include "ui/base/l10n/l10n_util.h"
30 #include "ui/gfx/font_list.h" 27 #include "ui/gfx/font_list.h"
31 #include "ui/gfx/text_elider.h" 28 #include "ui/gfx/text_elider.h"
32 29
33 namespace signin_ui_util { 30 namespace signin_ui_util {
34 31
35 base::string16 GetAuthenticatedUsername(const SigninManagerBase* signin) { 32 base::string16 GetAuthenticatedUsername(const SigninManagerBase* signin) {
36 std::string user_display_name; 33 std::string user_display_name;
37 34
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
74 std::string email = account_tracker->GetAccountInfo(account_id).email; 71 std::string email = account_tracker->GetAccountInfo(account_id).email;
75 if (email.empty()) { 72 if (email.empty()) {
76 DCHECK_EQ(AccountTrackerService::MIGRATION_NOT_STARTED, 73 DCHECK_EQ(AccountTrackerService::MIGRATION_NOT_STARTED,
77 account_tracker->GetMigrationState()); 74 account_tracker->GetMigrationState());
78 return account_id; 75 return account_id;
79 } 76 }
80 return email; 77 return email;
81 } 78 }
82 79
83 } // namespace signin_ui_util 80 } // namespace signin_ui_util
OLDNEW
« no previous file with comments | « chrome/browser/search/local_ntp_source.cc ('k') | chrome/browser/sync/sync_ui_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698