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 #include "chrome/browser/ui/views/aura/chrome_shell_delegate.h" | 5 #include "chrome/browser/ui/views/aura/chrome_shell_delegate.h" |
6 | 6 |
7 #include "ash/launcher/launcher_types.h" | 7 #include "ash/launcher/launcher_types.h" |
8 #include "ash/wm/window_util.h" | 8 #include "ash/wm/window_util.h" |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "chrome/browser/defaults.h" | 10 #include "chrome/browser/defaults.h" |
11 #include "chrome/browser/prefs/incognito_mode_prefs.h" | 11 #include "chrome/browser/prefs/incognito_mode_prefs.h" |
12 #include "chrome/browser/profiles/profile_manager.h" | 12 #include "chrome/browser/profiles/profile_manager.h" |
13 #include "chrome/browser/ui/browser.h" | 13 #include "chrome/browser/ui/browser.h" |
14 #include "chrome/browser/ui/browser_list.h" | 14 #include "chrome/browser/ui/browser_list.h" |
15 #include "chrome/browser/ui/views/aura/app_list/app_list_model_builder.h" | 15 #include "chrome/browser/ui/views/aura/app_list/app_list_model_builder.h" |
16 #include "chrome/browser/ui/views/aura/app_list/app_list_view_delegate.h" | 16 #include "chrome/browser/ui/views/aura/app_list/app_list_view_delegate.h" |
17 #include "chrome/browser/ui/views/aura/launcher_icon_updater.h" | 17 #include "chrome/browser/ui/views/aura/launcher_icon_updater.h" |
18 #include "chrome/browser/ui/views/aura/status_area_host_aura.h" | 18 #include "chrome/browser/ui/views/aura/status_area_host_aura.h" |
19 #include "chrome/browser/ui/views/frame/browser_view.h" | 19 #include "chrome/browser/ui/views/frame/browser_view.h" |
20 #include "grit/generated_resources.h" | |
sky
2012/01/30 15:33:46
Can you remove these now?
| |
20 #include "grit/theme_resources.h" | 21 #include "grit/theme_resources.h" |
21 #include "ui/aura/window.h" | 22 #include "ui/aura/window.h" |
23 #include "ui/base/l10n/l10n_util.h" | |
22 | 24 |
23 #if defined(OS_CHROMEOS) | 25 #if defined(OS_CHROMEOS) |
24 #include "chrome/browser/chromeos/dbus/dbus_thread_manager.h" | 26 #include "chrome/browser/chromeos/dbus/dbus_thread_manager.h" |
25 #include "chrome/browser/chromeos/dbus/power_manager_client.h" | 27 #include "chrome/browser/chromeos/dbus/power_manager_client.h" |
26 #endif | 28 #endif |
27 namespace { | 29 namespace { |
28 | 30 |
29 // Returns a list of Aura windows from a BrowserList, using either a | 31 // Returns a list of Aura windows from a BrowserList, using either a |
30 // const_iterator or const_reverse_iterator. | 32 // const_iterator or const_reverse_iterator. |
31 template<typename IT> | 33 template<typename IT> |
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
128 } | 130 } |
129 | 131 |
130 int ChromeShellDelegate::GetBrowserShortcutResourceId() { | 132 int ChromeShellDelegate::GetBrowserShortcutResourceId() { |
131 return IDR_PRODUCT_LOGO_32; | 133 return IDR_PRODUCT_LOGO_32; |
132 } | 134 } |
133 | 135 |
134 string16 ChromeShellDelegate::GetLauncherItemTitle( | 136 string16 ChromeShellDelegate::GetLauncherItemTitle( |
135 const ash::LauncherItem& item) { | 137 const ash::LauncherItem& item) { |
136 return LauncherIconUpdater::GetTitleByID(item.id); | 138 return LauncherIconUpdater::GetTitleByID(item.id); |
137 } | 139 } |
OLD | NEW |