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

Side by Side Diff: ash/system/status_area_widget.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_delegate.h ('k') | ash/system/tray/system_tray_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/system/status_area_widget.h" 5 #include "ash/system/status_area_widget.h"
6 6
7 #include "ash/root_window_controller.h" 7 #include "ash/root_window_controller.h"
8 #include "ash/shell.h" 8 #include "ash/shell.h"
9 #include "ash/shell_delegate.h" 9 #include "ash/shell_delegate.h"
10 #include "ash/shell_window_ids.h" 10 #include "ash/shell_window_ids.h"
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
118 118
119 virtual void ShowDriveSettings() OVERRIDE { 119 virtual void ShowDriveSettings() OVERRIDE {
120 } 120 }
121 121
122 virtual void ShowIMESettings() OVERRIDE { 122 virtual void ShowIMESettings() OVERRIDE {
123 } 123 }
124 124
125 virtual void ShowHelp() OVERRIDE { 125 virtual void ShowHelp() OVERRIDE {
126 } 126 }
127 127
128 virtual bool IsCapsLockOn() const OVERRIDE {
129 return caps_lock_enabled_;
130 }
131
132 virtual void SetCapsLockEnabled(bool enabled) OVERRIDE {
133 caps_lock_enabled_ = enabled;
134 }
135
136 virtual void ShutDown() OVERRIDE { 128 virtual void ShutDown() OVERRIDE {
137 MessageLoop::current()->Quit(); 129 MessageLoop::current()->Quit();
138 } 130 }
139 131
140 virtual void SignOut() OVERRIDE { 132 virtual void SignOut() OVERRIDE {
141 MessageLoop::current()->Quit(); 133 MessageLoop::current()->Quit();
142 } 134 }
143 135
144 virtual void RequestLockScreen() OVERRIDE {} 136 virtual void RequestLockScreen() OVERRIDE {}
145 137
(...skipping 279 matching lines...) Expand 10 before | Expand all | Expand 10 after
425 web_notification_tray_->IsMouseInNotificationBubble()); 417 web_notification_tray_->IsMouseInNotificationBubble());
426 } 418 }
427 if (should_show_launcher != should_show_launcher_) { 419 if (should_show_launcher != should_show_launcher_) {
428 should_show_launcher_ = should_show_launcher; 420 should_show_launcher_ = should_show_launcher;
429 Shell::GetInstance()->shelf()->UpdateAutoHideState(); 421 Shell::GetInstance()->shelf()->UpdateAutoHideState();
430 } 422 }
431 } 423 }
432 424
433 } // namespace internal 425 } // namespace internal
434 } // namespace ash 426 } // namespace ash
OLDNEW
« no previous file with comments | « ash/shell_delegate.h ('k') | ash/system/tray/system_tray_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698