| 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 "ash/test/test_shell_delegate.h" | 5 #include "ash/test/test_shell_delegate.h" |
| 6 | 6 |
| 7 #include <limits> | 7 #include <limits> |
| 8 | 8 |
| 9 #include "ash/app_list/app_list_presenter_delegate.h" | 9 #include "ash/app_list/app_list_presenter_delegate.h" |
| 10 #include "ash/app_list/app_list_presenter_delegate_factory.h" | 10 #include "ash/app_list/app_list_presenter_delegate_factory.h" |
| (...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 141 void TestShellDelegate::PreShutdown() {} | 141 void TestShellDelegate::PreShutdown() {} |
| 142 | 142 |
| 143 void TestShellDelegate::Exit() { | 143 void TestShellDelegate::Exit() { |
| 144 num_exit_requests_++; | 144 num_exit_requests_++; |
| 145 } | 145 } |
| 146 | 146 |
| 147 keyboard::KeyboardUI* TestShellDelegate::CreateKeyboardUI() { | 147 keyboard::KeyboardUI* TestShellDelegate::CreateKeyboardUI() { |
| 148 return new TestKeyboardUI; | 148 return new TestKeyboardUI; |
| 149 } | 149 } |
| 150 | 150 |
| 151 void TestShellDelegate::OpenUrl(const GURL& url) {} | 151 void TestShellDelegate::OpenUrlFromArc(const GURL& url) {} |
| 152 | 152 |
| 153 app_list::AppListPresenter* TestShellDelegate::GetAppListPresenter() { | 153 app_list::AppListPresenter* TestShellDelegate::GetAppListPresenter() { |
| 154 if (!app_list_presenter_) { | 154 if (!app_list_presenter_) { |
| 155 app_list_presenter_.reset(new app_list::AppListPresenterImpl( | 155 app_list_presenter_.reset(new app_list::AppListPresenterImpl( |
| 156 app_list_presenter_delegate_factory_.get())); | 156 app_list_presenter_delegate_factory_.get())); |
| 157 } | 157 } |
| 158 return app_list_presenter_.get(); | 158 return app_list_presenter_.get(); |
| 159 } | 159 } |
| 160 | 160 |
| 161 ShelfDelegate* TestShellDelegate::CreateShelfDelegate(ShelfModel* model) { | 161 ShelfDelegate* TestShellDelegate::CreateShelfDelegate(ShelfModel* model) { |
| (...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 212 void TestShellDelegate::SetMediaCaptureState(MediaCaptureState state) { | 212 void TestShellDelegate::SetMediaCaptureState(MediaCaptureState state) { |
| 213 #if defined(OS_CHROMEOS) | 213 #if defined(OS_CHROMEOS) |
| 214 static_cast<MediaDelegateImpl*>(WmShell::Get()->media_delegate()) | 214 static_cast<MediaDelegateImpl*>(WmShell::Get()->media_delegate()) |
| 215 ->set_media_capture_state(state); | 215 ->set_media_capture_state(state); |
| 216 WmShell::Get()->system_tray_notifier()->NotifyMediaCaptureChanged(); | 216 WmShell::Get()->system_tray_notifier()->NotifyMediaCaptureChanged(); |
| 217 #endif | 217 #endif |
| 218 } | 218 } |
| 219 | 219 |
| 220 } // namespace test | 220 } // namespace test |
| 221 } // namespace ash | 221 } // namespace ash |
| OLD | NEW |