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

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

Issue 10878058: Move functions for controlling Caps Lock to CapsLockDelegate from SystemTrayDelegate. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 8 years, 3 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 | Annotate | Revision Log
« 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/caps_lock_delegate_stub.h"
7 #include "ash/shell/example_factory.h" 8 #include "ash/shell/example_factory.h"
8 #include "ash/shell/launcher_delegate_impl.h" 9 #include "ash/shell/launcher_delegate_impl.h"
9 #include "ash/shell/toplevel_window.h" 10 #include "ash/shell/toplevel_window.h"
10 #include "ash/shell_window_ids.h" 11 #include "ash/shell_window_ids.h"
11 #include "base/message_loop.h" 12 #include "base/message_loop.h"
12 #include "ui/aura/window.h" 13 #include "ui/aura/window.h"
13 14
14 namespace ash { 15 namespace ash {
15 namespace shell { 16 namespace shell {
16 17
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
116 117
117 ash::SystemTrayDelegate* ShellDelegateImpl::CreateSystemTrayDelegate( 118 ash::SystemTrayDelegate* ShellDelegateImpl::CreateSystemTrayDelegate(
118 ash::SystemTray* tray) { 119 ash::SystemTray* tray) {
119 return NULL; 120 return NULL;
120 } 121 }
121 122
122 ash::UserWallpaperDelegate* ShellDelegateImpl::CreateUserWallpaperDelegate() { 123 ash::UserWallpaperDelegate* ShellDelegateImpl::CreateUserWallpaperDelegate() {
123 return NULL; 124 return NULL;
124 } 125 }
125 126
127 ash::CapsLockDelegate* ShellDelegateImpl::CreateCapsLockDelegate() {
128 return new CapsLockDelegateStub;
129 }
130
126 aura::client::UserActionClient* ShellDelegateImpl::CreateUserActionClient() { 131 aura::client::UserActionClient* ShellDelegateImpl::CreateUserActionClient() {
127 return NULL; 132 return NULL;
128 } 133 }
129 134
130 void ShellDelegateImpl::OpenFeedbackPage() { 135 void ShellDelegateImpl::OpenFeedbackPage() {
131 } 136 }
132 137
133 void ShellDelegateImpl::RecordUserMetricsAction(UserMetricsAction action) { 138 void ShellDelegateImpl::RecordUserMetricsAction(UserMetricsAction action) {
134 } 139 }
135 140
136 void ShellDelegateImpl::HandleMediaNextTrack() { 141 void ShellDelegateImpl::HandleMediaNextTrack() {
137 } 142 }
138 143
139 void ShellDelegateImpl::HandleMediaPlayPause() { 144 void ShellDelegateImpl::HandleMediaPlayPause() {
140 } 145 }
141 146
142 void ShellDelegateImpl::HandleMediaPrevTrack() { 147 void ShellDelegateImpl::HandleMediaPrevTrack() {
143 } 148 }
144 149
145 } // namespace shell 150 } // namespace shell
146 } // namespace ash 151 } // 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