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

Side by Side Diff: chrome/browser/app_controller_mac.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 | « no previous file | chrome/browser/app_controller_mac_browsertest.mm » ('j') | no next file with comments »

OLD	NEW
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 #import "chrome/browser/app_controller_mac.h"	5 #import "chrome/browser/app_controller_mac.h"

6	6

7 #include "apps/app_shim/app_shim_mac.h"	7 #include "apps/app_shim/app_shim_mac.h"

8 #include "apps/app_shim/extension_app_shim_handler_mac.h"	8 #include "apps/app_shim/extension_app_shim_handler_mac.h"

9 #include "apps/app_window_registry.h"	9 #include "apps/app_window_registry.h"

10 #include "base/auto_reset.h"	10 #include "base/auto_reset.h"

(...skipping 42 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
53 #include "chrome/browser/ui/chrome_pages.h"	53 #include "chrome/browser/ui/chrome_pages.h"

54 #import "chrome/browser/ui/cocoa/apps/app_shim_menu_controller_mac.h"	54 #import "chrome/browser/ui/cocoa/apps/app_shim_menu_controller_mac.h"

55 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.h"	55 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.h"

56 #import "chrome/browser/ui/cocoa/browser_window_cocoa.h"	56 #import "chrome/browser/ui/cocoa/browser_window_cocoa.h"

57 #import "chrome/browser/ui/cocoa/browser_window_controller.h"	57 #import "chrome/browser/ui/cocoa/browser_window_controller.h"

58 #import "chrome/browser/ui/cocoa/confirm_quit.h"	58 #import "chrome/browser/ui/cocoa/confirm_quit.h"

59 #import "chrome/browser/ui/cocoa/confirm_quit_panel_controller.h"	59 #import "chrome/browser/ui/cocoa/confirm_quit_panel_controller.h"

60 #import "chrome/browser/ui/cocoa/encoding_menu_controller_delegate_mac.h"	60 #import "chrome/browser/ui/cocoa/encoding_menu_controller_delegate_mac.h"

61 #import "chrome/browser/ui/cocoa/history_menu_bridge.h"	61 #import "chrome/browser/ui/cocoa/history_menu_bridge.h"

62 #include "chrome/browser/ui/cocoa/last_active_browser_cocoa.h"	62 #include "chrome/browser/ui/cocoa/last_active_browser_cocoa.h"

63 #import "chrome/browser/ui/cocoa/profile_menu_controller.h"	63 #import "chrome/browser/ui/cocoa/profiles/profile_menu_controller.h"

64 #import "chrome/browser/ui/cocoa/tabs/tab_strip_controller.h"	64 #import "chrome/browser/ui/cocoa/tabs/tab_strip_controller.h"

65 #import "chrome/browser/ui/cocoa/tabs/tab_window_controller.h"	65 #import "chrome/browser/ui/cocoa/tabs/tab_window_controller.h"

66 #include "chrome/browser/ui/cocoa/task_manager_mac.h"	66 #include "chrome/browser/ui/cocoa/task_manager_mac.h"

67 #include "chrome/browser/ui/extensions/application_launch.h"	67 #include "chrome/browser/ui/extensions/application_launch.h"

68 #include "chrome/browser/ui/host_desktop.h"	68 #include "chrome/browser/ui/host_desktop.h"

69 #include "chrome/browser/ui/startup/startup_browser_creator.h"	69 #include "chrome/browser/ui/startup/startup_browser_creator.h"

70 #include "chrome/browser/ui/startup/startup_browser_creator_impl.h"	70 #include "chrome/browser/ui/startup/startup_browser_creator_impl.h"

71 #include "chrome/common/chrome_paths_internal.h"	71 #include "chrome/common/chrome_paths_internal.h"

72 #include "chrome/common/chrome_switches.h"	72 #include "chrome/common/chrome_switches.h"

73 #include "chrome/common/cloud_print/cloud_print_class_mac.h"	73 #include "chrome/common/cloud_print/cloud_print_class_mac.h"

(...skipping 1411 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1485	1485

1486 //---------------------------------------------------------------------------	1486 //---------------------------------------------------------------------------

1487	1487

1488 namespace app_controller_mac {	1488 namespace app_controller_mac {

1489	1489

1490 bool IsOpeningNewWindow() {	1490 bool IsOpeningNewWindow() {

1491 return g_is_opening_new_window;	1491 return g_is_opening_new_window;

1492 }	1492 }

1493	1493

1494 } // namespace app_controller_mac	1494 } // namespace app_controller_mac

OLD	NEW