| 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 146 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 157 void TestShellDelegate::AddVirtualKeyboardStateObserver( | 157 void TestShellDelegate::AddVirtualKeyboardStateObserver( |
| 158 VirtualKeyboardStateObserver* observer) { | 158 VirtualKeyboardStateObserver* observer) { |
| 159 keyboard_state_observer_list_.AddObserver(observer); | 159 keyboard_state_observer_list_.AddObserver(observer); |
| 160 } | 160 } |
| 161 | 161 |
| 162 void TestShellDelegate::RemoveVirtualKeyboardStateObserver( | 162 void TestShellDelegate::RemoveVirtualKeyboardStateObserver( |
| 163 VirtualKeyboardStateObserver* observer) { | 163 VirtualKeyboardStateObserver* observer) { |
| 164 keyboard_state_observer_list_.RemoveObserver(observer); | 164 keyboard_state_observer_list_.RemoveObserver(observer); |
| 165 } | 165 } |
| 166 | 166 |
| 167 void TestShellDelegate::OpenUrl(const GURL& url) {} | 167 void TestShellDelegate::OpenUrlFromArc(const GURL& url) {} |
| 168 | 168 |
| 169 app_list::AppListPresenter* TestShellDelegate::GetAppListPresenter() { | 169 app_list::AppListPresenter* TestShellDelegate::GetAppListPresenter() { |
| 170 if (!app_list_presenter_) { | 170 if (!app_list_presenter_) { |
| 171 app_list_presenter_.reset(new app_list::AppListPresenterImpl( | 171 app_list_presenter_.reset(new app_list::AppListPresenterImpl( |
| 172 app_list_presenter_delegate_factory_.get())); | 172 app_list_presenter_delegate_factory_.get())); |
| 173 } | 173 } |
| 174 return app_list_presenter_.get(); | 174 return app_list_presenter_.get(); |
| 175 } | 175 } |
| 176 | 176 |
| 177 ShelfDelegate* TestShellDelegate::CreateShelfDelegate(ShelfModel* model) { | 177 ShelfDelegate* TestShellDelegate::CreateShelfDelegate(ShelfModel* model) { |
| (...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 228 void TestShellDelegate::SetMediaCaptureState(MediaCaptureState state) { | 228 void TestShellDelegate::SetMediaCaptureState(MediaCaptureState state) { |
| 229 #if defined(OS_CHROMEOS) | 229 #if defined(OS_CHROMEOS) |
| 230 static_cast<MediaDelegateImpl*>(WmShell::Get()->media_delegate()) | 230 static_cast<MediaDelegateImpl*>(WmShell::Get()->media_delegate()) |
| 231 ->set_media_capture_state(state); | 231 ->set_media_capture_state(state); |
| 232 WmShell::Get()->system_tray_notifier()->NotifyMediaCaptureChanged(); | 232 WmShell::Get()->system_tray_notifier()->NotifyMediaCaptureChanged(); |
| 233 #endif | 233 #endif |
| 234 } | 234 } |
| 235 | 235 |
| 236 } // namespace test | 236 } // namespace test |
| 237 } // namespace ash | 237 } // namespace ash |
| OLD | NEW |