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

Side by Side Diff: chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc

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
OLDNEW
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 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h" 5 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "ash/ash_switches.h" 9 #include "ash/ash_switches.h"
10 #include "ash/desktop_background/desktop_background_controller.h" 10 #include "ash/desktop_background/desktop_background_controller.h"
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 #include "chrome/browser/ui/ash/multi_user/multi_user_window_manager.h" 52 #include "chrome/browser/ui/ash/multi_user/multi_user_window_manager.h"
53 #include "chrome/browser/ui/browser.h" 53 #include "chrome/browser/ui/browser.h"
54 #include "chrome/browser/ui/browser_commands.h" 54 #include "chrome/browser/ui/browser_commands.h"
55 #include "chrome/browser/ui/browser_finder.h" 55 #include "chrome/browser/ui/browser_finder.h"
56 #include "chrome/browser/ui/browser_list.h" 56 #include "chrome/browser/ui/browser_list.h"
57 #include "chrome/browser/ui/browser_tabstrip.h" 57 #include "chrome/browser/ui/browser_tabstrip.h"
58 #include "chrome/browser/ui/browser_window.h" 58 #include "chrome/browser/ui/browser_window.h"
59 #include "chrome/browser/ui/extensions/app_launch_params.h" 59 #include "chrome/browser/ui/extensions/app_launch_params.h"
60 #include "chrome/browser/ui/extensions/application_launch.h" 60 #include "chrome/browser/ui/extensions/application_launch.h"
61 #include "chrome/browser/ui/extensions/extension_enable_flow.h" 61 #include "chrome/browser/ui/extensions/extension_enable_flow.h"
62 #include "chrome/browser/ui/host_desktop.h"
63 #include "chrome/browser/ui/tabs/tab_strip_model.h" 62 #include "chrome/browser/ui/tabs/tab_strip_model.h"
64 #include "chrome/browser/web_applications/web_app.h" 63 #include "chrome/browser/web_applications/web_app.h"
65 #include "chrome/common/chrome_switches.h" 64 #include "chrome/common/chrome_switches.h"
66 #include "chrome/common/extensions/manifest_handlers/app_launch_info.h" 65 #include "chrome/common/extensions/manifest_handlers/app_launch_info.h"
67 #include "chrome/common/pref_names.h" 66 #include "chrome/common/pref_names.h"
68 #include "chrome/common/url_constants.h" 67 #include "chrome/common/url_constants.h"
69 #include "chrome/grit/generated_resources.h" 68 #include "chrome/grit/generated_resources.h"
70 #include "components/favicon/content/content_favicon_driver.h" 69 #include "components/favicon/content/content_favicon_driver.h"
71 #include "content/public/browser/navigation_entry.h" 70 #include "content/public/browser/navigation_entry.h"
72 #include "content/public/browser/web_contents.h" 71 #include "content/public/browser/web_contents.h"
73 #include "extensions/browser/extension_prefs.h" 72 #include "extensions/browser/extension_prefs.h"
74 #include "extensions/browser/extension_registry.h" 73 #include "extensions/browser/extension_registry.h"
75 #include "extensions/browser/extension_system.h" 74 #include "extensions/browser/extension_system.h"
76 #include "extensions/browser/extension_util.h" 75 #include "extensions/browser/extension_util.h"
77 #include "extensions/common/constants.h" 76 #include "extensions/common/constants.h"
78 #include "extensions/common/extension.h" 77 #include "extensions/common/extension.h"
79 #include "extensions/common/extension_resource.h" 78 #include "extensions/common/extension_resource.h"
80 #include "extensions/common/manifest_handlers/icons_handler.h" 79 #include "extensions/common/manifest_handlers/icons_handler.h"
81 #include "extensions/common/url_pattern.h" 80 #include "extensions/common/url_pattern.h"
82 #include "grit/ash_resources.h" 81 #include "grit/ash_resources.h"
83 #include "grit/theme_resources.h" 82 #include "grit/theme_resources.h"
84 #include "net/base/url_util.h" 83 #include "net/base/url_util.h"
85 #include "ui/aura/window.h" 84 #include "ui/aura/window.h"
86 #include "ui/aura/window_event_dispatcher.h" 85 #include "ui/aura/window_event_dispatcher.h"
87 #include "ui/base/l10n/l10n_util.h" 86 #include "ui/base/l10n/l10n_util.h"
88 #include "ui/base/window_open_disposition.h" 87 #include "ui/base/window_open_disposition.h"
88 #include "ui/gfx/host_desktop_type.h"
89 #include "ui/keyboard/keyboard_util.h" 89 #include "ui/keyboard/keyboard_util.h"
90 #include "ui/resources/grit/ui_resources.h" 90 #include "ui/resources/grit/ui_resources.h"
91 #include "ui/wm/core/window_animations.h" 91 #include "ui/wm/core/window_animations.h"
92 92
93 #if defined(OS_CHROMEOS) 93 #if defined(OS_CHROMEOS)
94 #include "chrome/browser/browser_process.h" 94 #include "chrome/browser/browser_process.h"
95 #include "chrome/browser/ui/ash/chrome_shell_delegate.h" 95 #include "chrome/browser/ui/ash/chrome_shell_delegate.h"
96 #include "chrome/browser/ui/ash/launcher/multi_profile_app_window_launcher_contr oller.h" 96 #include "chrome/browser/ui/ash/launcher/multi_profile_app_window_launcher_contr oller.h"
97 #include "chrome/browser/ui/ash/launcher/multi_profile_browser_status_monitor.h" 97 #include "chrome/browser/ui/ash/launcher/multi_profile_browser_status_monitor.h"
98 #include "components/user_manager/user_manager.h" 98 #include "components/user_manager/user_manager.h"
(...skipping 2000 matching lines...) Expand 10 before | Expand all | Expand 10 after
2099 void ChromeLauncherController::ReleaseProfile() { 2099 void ChromeLauncherController::ReleaseProfile() {
2100 if (app_sync_ui_state_) 2100 if (app_sync_ui_state_)
2101 app_sync_ui_state_->RemoveObserver(this); 2101 app_sync_ui_state_->RemoveObserver(this);
2102 2102
2103 extensions::ExtensionRegistry::Get(profile_)->RemoveObserver(this); 2103 extensions::ExtensionRegistry::Get(profile_)->RemoveObserver(this);
2104 2104
2105 PrefServiceSyncable::FromProfile(profile_)->RemoveObserver(this); 2105 PrefServiceSyncable::FromProfile(profile_)->RemoveObserver(this);
2106 2106
2107 pref_change_registrar_.RemoveAll(); 2107 pref_change_registrar_.RemoveAll();
2108 } 2108 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698