Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(389)

Side by Side Diff: ash/shell/shell_delegate_impl.cc

Issue 1392713002: Extract content dependency from keyboard code (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 5 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « ash/shell/shell_delegate_impl.h ('k') | ash/shell_delegate.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/shell/shell_delegate_impl.h" 5 #include "ash/shell/shell_delegate_impl.h"
6 6
7 #include "ash/accessibility_delegate.h" 7 #include "ash/accessibility_delegate.h"
8 #include "ash/default_accessibility_delegate.h" 8 #include "ash/default_accessibility_delegate.h"
9 #include "ash/default_user_wallpaper_delegate.h" 9 #include "ash/default_user_wallpaper_delegate.h"
10 #include "ash/gpu_support_stub.h" 10 #include "ash/gpu_support_stub.h"
11 #include "ash/media_delegate.h" 11 #include "ash/media_delegate.h"
12 #include "ash/new_window_delegate.h" 12 #include "ash/new_window_delegate.h"
13 #include "ash/session/session_state_delegate.h" 13 #include "ash/session/session_state_delegate.h"
14 #include "ash/shell/content/shell_content_state_impl.h" 14 #include "ash/shell/content/shell_content_state_impl.h"
15 #include "ash/shell/context_menu.h" 15 #include "ash/shell/context_menu.h"
16 #include "ash/shell/example_factory.h" 16 #include "ash/shell/example_factory.h"
17 #include "ash/shell/shelf_delegate_impl.h" 17 #include "ash/shell/shelf_delegate_impl.h"
18 #include "ash/shell/toplevel_window.h" 18 #include "ash/shell/toplevel_window.h"
19 #include "ash/shell_window_ids.h" 19 #include "ash/shell_window_ids.h"
20 #include "ash/system/tray/default_system_tray_delegate.h" 20 #include "ash/system/tray/default_system_tray_delegate.h"
21 #include "ash/test/content/keyboard_controller_proxy_stub.h" 21 #include "ash/test/test_keyboard_ui.h"
22 #include "ash/wm/window_state.h" 22 #include "ash/wm/window_state.h"
23 #include "base/message_loop/message_loop.h" 23 #include "base/message_loop/message_loop.h"
24 #include "base/strings/utf_string_conversions.h" 24 #include "base/strings/utf_string_conversions.h"
25 #include "components/user_manager/user_info_impl.h" 25 #include "components/user_manager/user_info_impl.h"
26 #include "ui/app_list/app_list_view_delegate.h" 26 #include "ui/app_list/app_list_view_delegate.h"
27 #include "ui/aura/window.h" 27 #include "ui/aura/window.h"
28 #include "ui/gfx/image/image.h" 28 #include "ui/gfx/image/image.h"
29 #include "ui/gfx/image/image_skia.h" 29 #include "ui/gfx/image/image_skia.h"
30 30
31 namespace ash { 31 namespace ash {
(...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after
180 void ShellDelegateImpl::PreInit() { 180 void ShellDelegateImpl::PreInit() {
181 } 181 }
182 182
183 void ShellDelegateImpl::PreShutdown() { 183 void ShellDelegateImpl::PreShutdown() {
184 } 184 }
185 185
186 void ShellDelegateImpl::Exit() { 186 void ShellDelegateImpl::Exit() {
187 base::MessageLoopForUI::current()->Quit(); 187 base::MessageLoopForUI::current()->Quit();
188 } 188 }
189 189
190 keyboard::KeyboardControllerProxy* 190 keyboard::KeyboardUI* ShellDelegateImpl::CreateKeyboardUI() {
191 ShellDelegateImpl::CreateKeyboardControllerProxy() { 191 return new TestKeyboardUI;
192 return new KeyboardControllerProxyStub();
193 } 192 }
194 193
195 void ShellDelegateImpl::VirtualKeyboardActivated(bool activated) { 194 void ShellDelegateImpl::VirtualKeyboardActivated(bool activated) {
196 } 195 }
197 196
198 void ShellDelegateImpl::AddVirtualKeyboardStateObserver( 197 void ShellDelegateImpl::AddVirtualKeyboardStateObserver(
199 VirtualKeyboardStateObserver* observer) { 198 VirtualKeyboardStateObserver* observer) {
200 } 199 }
201 200
202 void ShellDelegateImpl::RemoveVirtualKeyboardStateObserver( 201 void ShellDelegateImpl::RemoveVirtualKeyboardStateObserver(
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
253 base::string16 ShellDelegateImpl::GetProductName() const { 252 base::string16 ShellDelegateImpl::GetProductName() const {
254 return base::string16(); 253 return base::string16();
255 } 254 }
256 255
257 gfx::Image ShellDelegateImpl::GetDeprecatedAcceleratorImage() const { 256 gfx::Image ShellDelegateImpl::GetDeprecatedAcceleratorImage() const {
258 return gfx::Image(); 257 return gfx::Image();
259 } 258 }
260 259
261 } // namespace shell 260 } // namespace shell
262 } // namespace ash 261 } // namespace ash
OLDNEW
« no previous file with comments | « ash/shell/shell_delegate_impl.h ('k') | ash/shell_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698