| 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/ash/chrome_shell_delegate.h" |
| 6 | 6 |
| 7 #include "ash/launcher/launcher_types.h" | 7 #include "ash/launcher/launcher_types.h" |
| 8 #include "ash/system/tray/system_tray_delegate.h" | 8 #include "ash/system/tray/system_tray_delegate.h" |
| 9 #include "ash/wm/partial_screenshot_view.h" | 9 #include "ash/wm/partial_screenshot_view.h" |
| 10 #include "ash/wm/window_util.h" | 10 #include "ash/wm/window_util.h" |
| 11 #include "base/command_line.h" | 11 #include "base/command_line.h" |
| 12 #include "chrome/browser/ui/browser.h" | 12 #include "chrome/browser/ui/browser.h" |
| 13 #include "chrome/browser/ui/browser_list.h" | 13 #include "chrome/browser/ui/browser_list.h" |
| 14 #include "chrome/browser/ui/views/aura/app_list/app_list_view_delegate.h" | 14 #include "chrome/browser/ui/views/ash/app_list/app_list_view_delegate.h" |
| 15 #include "chrome/browser/ui/views/aura/launcher/chrome_launcher_delegate.h" | 15 #include "chrome/browser/ui/views/ash/launcher/chrome_launcher_delegate.h" |
| 16 #include "chrome/browser/ui/views/aura/status_area_host_aura.h" | 16 #include "chrome/browser/ui/views/ash/status_area_host_aura.h" |
| 17 #include "chrome/browser/ui/views/frame/browser_view.h" | 17 #include "chrome/browser/ui/views/frame/browser_view.h" |
| 18 #include "chrome/common/chrome_switches.h" | 18 #include "chrome/common/chrome_switches.h" |
| 19 #include "ui/aura/window.h" | 19 #include "ui/aura/window.h" |
| 20 | 20 |
| 21 #if defined(OS_CHROMEOS) | 21 #if defined(OS_CHROMEOS) |
| 22 #include "chrome/browser/chromeos/dbus/dbus_thread_manager.h" | 22 #include "chrome/browser/chromeos/dbus/dbus_thread_manager.h" |
| 23 #include "chrome/browser/chromeos/dbus/power_manager_client.h" | 23 #include "chrome/browser/chromeos/dbus/power_manager_client.h" |
| 24 #include "chrome/browser/chromeos/system/ash_system_tray_delegate.h" | 24 #include "chrome/browser/chromeos/system/ash_system_tray_delegate.h" |
| 25 #endif | 25 #endif |
| 26 namespace { | 26 namespace { |
| (...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 122 return chromeos::CreateSystemTrayDelegate(tray); | 122 return chromeos::CreateSystemTrayDelegate(tray); |
| 123 #else | 123 #else |
| 124 return NULL; | 124 return NULL; |
| 125 #endif | 125 #endif |
| 126 } | 126 } |
| 127 | 127 |
| 128 bool ChromeShellDelegate::GetOverrideWindowMode( | 128 bool ChromeShellDelegate::GetOverrideWindowMode( |
| 129 ash::Shell::WindowMode* window_mode) { | 129 ash::Shell::WindowMode* window_mode) { |
| 130 return false; | 130 return false; |
| 131 } | 131 } |
| OLD | NEW |