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

Side by Side Diff: chrome/browser/app_controller_mac.mm

Issue 1336993002: Straighten up includes of host_desktop.h/host_desktop_type.h (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@host_desktop_type
Patch Set: Build fixes for Windows and Mac Created 5 years, 3 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 | « no previous file | chrome/browser/app_controller_mac_browsertest.mm » ('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) 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 "base/auto_reset.h" 7 #include "base/auto_reset.h"
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/files/file_path.h" 10 #include "base/files/file_path.h"
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 #include "chrome/browser/ui/cocoa/apps/quit_with_apps_controller_mac.h" 60 #include "chrome/browser/ui/cocoa/apps/quit_with_apps_controller_mac.h"
61 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.h" 61 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.h"
62 #import "chrome/browser/ui/cocoa/confirm_quit.h" 62 #import "chrome/browser/ui/cocoa/confirm_quit.h"
63 #import "chrome/browser/ui/cocoa/confirm_quit_panel_controller.h" 63 #import "chrome/browser/ui/cocoa/confirm_quit_panel_controller.h"
64 #import "chrome/browser/ui/cocoa/encoding_menu_controller_delegate_mac.h" 64 #import "chrome/browser/ui/cocoa/encoding_menu_controller_delegate_mac.h"
65 #include "chrome/browser/ui/cocoa/handoff_active_url_observer_bridge.h" 65 #include "chrome/browser/ui/cocoa/handoff_active_url_observer_bridge.h"
66 #import "chrome/browser/ui/cocoa/history_menu_bridge.h" 66 #import "chrome/browser/ui/cocoa/history_menu_bridge.h"
67 #include "chrome/browser/ui/cocoa/last_active_browser_cocoa.h" 67 #include "chrome/browser/ui/cocoa/last_active_browser_cocoa.h"
68 #import "chrome/browser/ui/cocoa/profiles/profile_menu_controller.h" 68 #import "chrome/browser/ui/cocoa/profiles/profile_menu_controller.h"
69 #include "chrome/browser/ui/extensions/application_launch.h" 69 #include "chrome/browser/ui/extensions/application_launch.h"
70 #include "chrome/browser/ui/host_desktop.h"
71 #include "chrome/browser/ui/startup/startup_browser_creator.h" 70 #include "chrome/browser/ui/startup/startup_browser_creator.h"
72 #include "chrome/browser/ui/startup/startup_browser_creator_impl.h" 71 #include "chrome/browser/ui/startup/startup_browser_creator_impl.h"
73 #include "chrome/browser/ui/tabs/tab_strip_model.h" 72 #include "chrome/browser/ui/tabs/tab_strip_model.h"
74 #include "chrome/browser/ui/user_manager.h" 73 #include "chrome/browser/ui/user_manager.h"
75 #include "chrome/browser/web_applications/web_app_mac.h" 74 #include "chrome/browser/web_applications/web_app_mac.h"
76 #include "chrome/common/chrome_paths_internal.h" 75 #include "chrome/common/chrome_paths_internal.h"
77 #include "chrome/common/chrome_switches.h" 76 #include "chrome/common/chrome_switches.h"
78 #include "chrome/common/cloud_print/cloud_print_class_mac.h" 77 #include "chrome/common/cloud_print/cloud_print_class_mac.h"
79 #include "chrome/common/extensions/extension_constants.h" 78 #include "chrome/common/extensions/extension_constants.h"
80 #include "chrome/common/mac/app_mode_common.h" 79 #include "chrome/common/mac/app_mode_common.h"
(...skipping 10 matching lines...) Expand all
91 #include "content/public/browser/notification_service.h" 90 #include "content/public/browser/notification_service.h"
92 #include "content/public/browser/notification_types.h" 91 #include "content/public/browser/notification_types.h"
93 #include "content/public/browser/plugin_service.h" 92 #include "content/public/browser/plugin_service.h"
94 #include "content/public/browser/user_metrics.h" 93 #include "content/public/browser/user_metrics.h"
95 #include "extensions/browser/extension_registry.h" 94 #include "extensions/browser/extension_registry.h"
96 #include "extensions/browser/extension_system.h" 95 #include "extensions/browser/extension_system.h"
97 #include "net/base/filename_util.h" 96 #include "net/base/filename_util.h"
98 #include "ui/base/cocoa/focus_window_set.h" 97 #include "ui/base/cocoa/focus_window_set.h"
99 #include "ui/base/l10n/l10n_util.h" 98 #include "ui/base/l10n/l10n_util.h"
100 #include "ui/base/l10n/l10n_util_mac.h" 99 #include "ui/base/l10n/l10n_util_mac.h"
100 #include "ui/gfx/host_desktop_type.h"
101 101
102 using apps::AppShimHandler; 102 using apps::AppShimHandler;
103 using apps::ExtensionAppShimHandler; 103 using apps::ExtensionAppShimHandler;
104 using base::UserMetricsAction; 104 using base::UserMetricsAction;
105 using content::BrowserContext; 105 using content::BrowserContext;
106 using content::BrowserThread; 106 using content::BrowserThread;
107 using content::DownloadManager; 107 using content::DownloadManager;
108 108
109 namespace { 109 namespace {
110 110
(...skipping 1609 matching lines...) Expand 10 before | Expand all | Expand 10 after
1720 1720
1721 //--------------------------------------------------------------------------- 1721 //---------------------------------------------------------------------------
1722 1722
1723 namespace app_controller_mac { 1723 namespace app_controller_mac {
1724 1724
1725 bool IsOpeningNewWindow() { 1725 bool IsOpeningNewWindow() {
1726 return g_is_opening_new_window; 1726 return g_is_opening_new_window;
1727 } 1727 }
1728 1728
1729 } // namespace app_controller_mac 1729 } // namespace app_controller_mac
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/app_controller_mac_browsertest.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698