chrome/browser/ui/views/profiles/profile_chooser_view.cc - Issue 235813002: Add profile-switches to signin-internals; move switches to component

Side by Side Diff: chrome/browser/ui/views/profiles/profile_chooser_view.cc

Issue 235813002: Add profile-switches to signin-internals; move switches to component (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix gyp(i) files Created 6 years, 8 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/ui/views/profiles/avatar_menu_button.cc ('k') | chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc » ('j') | chrome/common/profile_management_switches.h » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright 2014 The Chromium Authors. All rights reserved.	1 // Copyright 2014 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/views/profiles/profile_chooser_view.h"	5 #include "chrome/browser/ui/views/profiles/profile_chooser_view.h"

6	6

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

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

9 #include "chrome/browser/browser_process.h"	9 #include "chrome/browser/browser_process.h"

10 #include "chrome/browser/lifetime/application_lifetime.h"	10 #include "chrome/browser/lifetime/application_lifetime.h"

11 #include "chrome/browser/profiles/profile_avatar_icon_util.h"	11 #include "chrome/browser/profiles/profile_avatar_icon_util.h"

12 #include "chrome/browser/profiles/profile_manager.h"	12 #include "chrome/browser/profiles/profile_manager.h"

13 #include "chrome/browser/profiles/profile_window.h"	13 #include "chrome/browser/profiles/profile_window.h"

14 #include "chrome/browser/profiles/profiles_state.h"	14 #include "chrome/browser/profiles/profiles_state.h"

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

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

17 #include "chrome/browser/signin/signin_promo.h"	17 #include "chrome/browser/signin/signin_promo.h"

18 #include "chrome/browser/ui/browser.h"	18 #include "chrome/browser/ui/browser.h"

19 #include "chrome/browser/ui/browser_dialogs.h"	19 #include "chrome/browser/ui/browser_dialogs.h"

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

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

22 #include "chrome/browser/ui/views/profiles/user_manager_view.h"	22 #include "chrome/browser/ui/views/profiles/user_manager_view.h"

23 #include "chrome/common/pref_names.h"	23 #include "chrome/common/pref_names.h"

24 #include "chrome/common/profile_management_switches.h"

25 #include "chrome/common/url_constants.h"	24 #include "chrome/common/url_constants.h"

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

27 #include "components/signin/core/browser/profile_oauth2_token_service.h"	26 #include "components/signin/core/browser/profile_oauth2_token_service.h"

28 #include "components/signin/core/browser/signin_manager.h"	27 #include "components/signin/core/browser/signin_manager.h"

	28 #include "components/signin/core/common/profile_management_switches.h"

29 #include "grit/chromium_strings.h"	29 #include "grit/chromium_strings.h"

30 #include "grit/generated_resources.h"	30 #include "grit/generated_resources.h"

31 #include "grit/theme_resources.h"	31 #include "grit/theme_resources.h"

32 #include "third_party/skia/include/core/SkColor.h"	32 #include "third_party/skia/include/core/SkColor.h"

33 #include "ui/base/l10n/l10n_util.h"	33 #include "ui/base/l10n/l10n_util.h"

34 #include "ui/base/resource/resource_bundle.h"	34 #include "ui/base/resource/resource_bundle.h"

35 #include "ui/gfx/canvas.h"	35 #include "ui/gfx/canvas.h"

36 #include "ui/gfx/image/image.h"	36 #include "ui/gfx/image/image.h"

37 #include "ui/gfx/image/image_skia.h"	37 #include "ui/gfx/image/image_skia.h"

38 #include "ui/gfx/text_elider.h"	38 #include "ui/gfx/text_elider.h"

(...skipping 1087 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1126 gfx::ALIGN_CENTER);	1126 gfx::ALIGN_CENTER);

1127 layout->StartRowWithPadding(	1127 layout->StartRowWithPadding(

1128 1, 0, 0, views::kUnrelatedControlVerticalSpacing);	1128 1, 0, 0, views::kUnrelatedControlVerticalSpacing);

1129 layout->AddView(remove_account_and_relaunch_button_);	1129 layout->AddView(remove_account_and_relaunch_button_);

1130 } else {	1130 } else {

1131 layout->AddPaddingRow(0, views::kUnrelatedControlVerticalSpacing);	1131 layout->AddPaddingRow(0, views::kUnrelatedControlVerticalSpacing);

1132 }	1132 }

1133	1133

1134 return view;	1134 return view;

1135 }	1135 }

OLD	NEW