| 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/ash/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/chromeos/login/screen_locker.h" |   12 #include "chrome/browser/chromeos/login/screen_locker.h" | 
|   13 #include "chrome/browser/profiles/profile_manager.h" |   13 #include "chrome/browser/profiles/profile_manager.h" | 
|   14 #include "chrome/browser/ui/browser.h" |   14 #include "chrome/browser/ui/browser.h" | 
|   15 #include "chrome/browser/ui/browser_list.h" |   15 #include "chrome/browser/ui/browser_list.h" | 
|   16 #include "chrome/browser/ui/views/ash/app_list/app_list_view_delegate.h" |   16 #include "chrome/browser/ui/views/ash/app_list/app_list_view_delegate.h" | 
|   17 #include "chrome/browser/ui/views/ash/launcher/chrome_launcher_delegate.h" |   17 #include "chrome/browser/ui/views/ash/launcher/chrome_launcher_delegate.h" | 
|   18 #include "chrome/browser/ui/views/ash/status_area_host_aura.h" |   18 #include "chrome/browser/ui/views/ash/status_area_host_aura.h" | 
|   19 #include "chrome/browser/ui/views/ash/window_positioner.h" |   19 #include "chrome/browser/ui/views/ash/window_positioner.h" | 
|   20 #include "chrome/browser/ui/views/frame/browser_view.h" |   20 #include "chrome/browser/ui/views/frame/browser_view.h" | 
|   21 #include "chrome/common/chrome_notification_types.h" |   21 #include "chrome/common/chrome_notification_types.h" | 
|   22 #include "chrome/common/chrome_switches.h" |   22 #include "chrome/common/chrome_switches.h" | 
|   23 #include "content/public/browser/notification_service.h" |   23 #include "content/public/browser/notification_service.h" | 
|   24 #include "ui/aura/window.h" |   24 #include "ui/aura/window.h" | 
|   25  |   25  | 
|   26 #if defined(OS_CHROMEOS) |   26 #if defined(OS_CHROMEOS) | 
|   27 #include "base/chromeos/chromeos_version.h" |   27 #include "base/chromeos/chromeos_version.h" | 
|   28 #include "chrome/browser/chromeos/background/desktop_background_observer.h" |   28 #include "chrome/browser/chromeos/background/desktop_background_observer.h" | 
|   29 #include "chrome/browser/chromeos/dbus/dbus_thread_manager.h" |  | 
|   30 #include "chrome/browser/chromeos/dbus/power_manager_client.h" |  | 
|   31 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h" |   29 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h" | 
|   32 #include "chrome/browser/chromeos/login/user_manager.h" |   30 #include "chrome/browser/chromeos/login/user_manager.h" | 
|   33 #include "chrome/browser/chromeos/system/ash_system_tray_delegate.h" |   31 #include "chrome/browser/chromeos/system/ash_system_tray_delegate.h" | 
 |   32 #include "chromeos/dbus/dbus_thread_manager.h" | 
 |   33 #include "chromeos/dbus/power_manager_client.h" | 
|   34 #endif |   34 #endif | 
|   35  |   35  | 
|   36 // static |   36 // static | 
|   37 ChromeShellDelegate* ChromeShellDelegate::instance_ = NULL; |   37 ChromeShellDelegate* ChromeShellDelegate::instance_ = NULL; | 
|   38  |   38  | 
|   39 ChromeShellDelegate::ChromeShellDelegate() |   39 ChromeShellDelegate::ChromeShellDelegate() | 
|   40     : window_positioner_(new WindowPositioner()) { |   40     : window_positioner_(new WindowPositioner()) { | 
|   41   instance_ = this; |   41   instance_ = this; | 
|   42 #if defined(OS_CHROMEOS) |   42 #if defined(OS_CHROMEOS) | 
|   43   registrar_.Add( |   43   registrar_.Add( | 
| (...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  155       ash::Shell::GetInstance()->CreateLauncher(); |  155       ash::Shell::GetInstance()->CreateLauncher(); | 
|  156       break; |  156       break; | 
|  157     default: |  157     default: | 
|  158       NOTREACHED() << "Unexpected notification " << type; |  158       NOTREACHED() << "Unexpected notification " << type; | 
|  159   } |  159   } | 
|  160 #else |  160 #else | 
|  161   // MSVC++ warns about switch statements without any cases. |  161   // MSVC++ warns about switch statements without any cases. | 
|  162   NOTREACHED() << "Unexpected notification " << type; |  162   NOTREACHED() << "Unexpected notification " << type; | 
|  163 #endif |  163 #endif | 
|  164 } |  164 } | 
| OLD | NEW |