| 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" |
| (...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 115 BrowserList::end_last_active()); | 115 BrowserList::end_last_active()); |
| 116 } | 116 } |
| 117 | 117 |
| 118 void ChromeShellDelegate::StartPartialScreenshot( | 118 void ChromeShellDelegate::StartPartialScreenshot( |
| 119 ash::ScreenshotDelegate* screenshot_delegate) { | 119 ash::ScreenshotDelegate* screenshot_delegate) { |
| 120 ash::PartialScreenshotView::StartPartialScreenshot(screenshot_delegate); | 120 ash::PartialScreenshotView::StartPartialScreenshot(screenshot_delegate); |
| 121 } | 121 } |
| 122 | 122 |
| 123 ash::LauncherDelegate* ChromeShellDelegate::CreateLauncherDelegate( | 123 ash::LauncherDelegate* ChromeShellDelegate::CreateLauncherDelegate( |
| 124 ash::LauncherModel* model) { | 124 ash::LauncherModel* model) { |
| 125 ChromeLauncherDelegate* delegate = new ChromeLauncherDelegate(NULL, model); | 125 return new ChromeLauncherDelegate(NULL, model); |
| 126 delegate->Init(); | |
| 127 return delegate; | |
| 128 } | 126 } |
| 129 | 127 |
| 130 ash::SystemTrayDelegate* ChromeShellDelegate::CreateSystemTrayDelegate( | 128 ash::SystemTrayDelegate* ChromeShellDelegate::CreateSystemTrayDelegate( |
| 131 ash::SystemTray* tray) { | 129 ash::SystemTray* tray) { |
| 132 #if defined(OS_CHROMEOS) | 130 #if defined(OS_CHROMEOS) |
| 133 return chromeos::CreateSystemTrayDelegate(tray); | 131 return chromeos::CreateSystemTrayDelegate(tray); |
| 134 #else | 132 #else |
| 135 return NULL; | 133 return NULL; |
| 136 #endif | 134 #endif |
| 137 } | 135 } |
| (...skipping 15 matching lines...) Expand all Loading... |
| 153 ash::Shell::GetInstance()->CreateLauncher(); | 151 ash::Shell::GetInstance()->CreateLauncher(); |
| 154 break; | 152 break; |
| 155 default: | 153 default: |
| 156 NOTREACHED() << "Unexpected notification " << type; | 154 NOTREACHED() << "Unexpected notification " << type; |
| 157 } | 155 } |
| 158 #else | 156 #else |
| 159 // MSVC++ warns about switch statements without any cases. | 157 // MSVC++ warns about switch statements without any cases. |
| 160 NOTREACHED() << "Unexpected notification " << type; | 158 NOTREACHED() << "Unexpected notification " << type; |
| 161 #endif | 159 #endif |
| 162 } | 160 } |
| OLD | NEW |