chrome/browser/ui/cocoa/profiles/profile_chooser_controller.mm - Issue 229163004: [Mac] Move profile related UI from cocoa/browser to cocoa/profiles

Side by Side Diff: chrome/browser/ui/cocoa/profiles/profile_chooser_controller.mm

Issue 229163004: [Mac] Move profile related UI from cocoa/browser to cocoa/profiles (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: oops forgot a comment 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 | Annotate | Revision Log

« no previous file with comments | « chrome/browser/ui/cocoa/profiles/profile_chooser_controller.h ('k') | chrome/browser/ui/cocoa/profiles/profile_chooser_controller_unittest.mm » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright 2013 The Chromium Authors. All rights reserved.	1 // Copyright 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 #import <Cocoa/Cocoa.h>	5 #import <Cocoa/Cocoa.h>

6	6

7 #import "chrome/browser/ui/cocoa/browser/profile_chooser_controller.h"	7 #import "chrome/browser/ui/cocoa/profiles/profile_chooser_controller.h"

8	8

9 #include "base/mac/bundle_locations.h"	9 #include "base/mac/bundle_locations.h"

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

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

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

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

14 #include "chrome/browser/chrome_notification_types.h"	14 #include "chrome/browser/chrome_notification_types.h"

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

16 #include "chrome/browser/profiles/avatar_menu.h"	16 #include "chrome/browser/profiles/avatar_menu.h"

17 #include "chrome/browser/profiles/avatar_menu_observer.h"	17 #include "chrome/browser/profiles/avatar_menu_observer.h"

18 #include "chrome/browser/profiles/profile_info_cache.h"	18 #include "chrome/browser/profiles/profile_info_cache.h"

19 #include "chrome/browser/profiles/profile_info_util.h"	19 #include "chrome/browser/profiles/profile_info_util.h"

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

21 #include "chrome/browser/profiles/profile_metrics.h"	21 #include "chrome/browser/profiles/profile_metrics.h"

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

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

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

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

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

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

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

29 #include "chrome/browser/ui/browser_window.h"	29 #include "chrome/browser/ui/browser_window.h"

30 #include "chrome/browser/ui/chrome_style.h"	30 #include "chrome/browser/ui/chrome_style.h"

31 #import "chrome/browser/ui/cocoa/info_bubble_view.h"	31 #import "chrome/browser/ui/cocoa/info_bubble_view.h"

32 #import "chrome/browser/ui/cocoa/info_bubble_window.h"	32 #import "chrome/browser/ui/cocoa/info_bubble_window.h"

33 #import "chrome/browser/ui/cocoa/user_manager_mac.h"	33 #import "chrome/browser/ui/cocoa/profiles/user_manager_mac.h"

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

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

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

37 #include "chrome/common/url_constants.h"	37 #include "chrome/common/url_constants.h"

38 #include "components/signin/core/browser/mutable_profile_oauth2_token_service.h"	38 #include "components/signin/core/browser/mutable_profile_oauth2_token_service.h"

39 #include "components/signin/core/browser/profile_oauth2_token_service.h"	39 #include "components/signin/core/browser/profile_oauth2_token_service.h"

40 #include "components/signin/core/browser/signin_manager.h"	40 #include "components/signin/core/browser/signin_manager.h"

41 #include "content/public/browser/notification_service.h"	41 #include "content/public/browser/notification_service.h"

42 #include "content/public/browser/web_contents.h"	42 #include "content/public/browser/web_contents.h"

43 #include "content/public/browser/web_contents_view.h"	43 #include "content/public/browser/web_contents_view.h"

(...skipping 1330 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1374 [button setImage:ui::ResourceBundle::GetSharedInstance().	1374 [button setImage:ui::ResourceBundle::GetSharedInstance().

1375 GetNativeImageNamed(IDR_CLOSE_1).ToNSImage()];	1375 GetNativeImageNamed(IDR_CLOSE_1).ToNSImage()];

1376 [button setImagePosition:NSImageRight];	1376 [button setImagePosition:NSImageRight];

1377 [button setTarget:self];	1377 [button setTarget:self];

1378 [button setAction:@selector(showAccountRemovalView:)];	1378 [button setAction:@selector(showAccountRemovalView:)];

1379	1379

1380 return button.autorelease();	1380 return button.autorelease();

1381 }	1381 }

1382	1382

1383 @end	1383 @end

OLD	NEW