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

Side by Side Diff: ash/system/tray/system_tray.cc

Issue 9835045: Support IME properties in uber tray. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 9 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
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/tray/system_tray.h" 5 #include "ash/system/tray/system_tray.h"
6 6
7 #include "ash/shell.h" 7 #include "ash/shell.h"
8 #include "ash/shell/panel_window.h" 8 #include "ash/shell/panel_window.h"
9 #include "ash/shell_window_ids.h" 9 #include "ash/shell_window_ids.h"
10 #include "ash/system/tray/tray_constants.h" 10 #include "ash/system/tray/tray_constants.h"
(...skipping 382 matching lines...) Expand 10 before | Expand all | Expand 10 after
393 BluetoothDeviceInfo::~BluetoothDeviceInfo() { 393 BluetoothDeviceInfo::~BluetoothDeviceInfo() {
394 } 394 }
395 395
396 IMEInfo::IMEInfo() 396 IMEInfo::IMEInfo()
397 : selected(false) { 397 : selected(false) {
398 } 398 }
399 399
400 IMEInfo::~IMEInfo() { 400 IMEInfo::~IMEInfo() {
401 } 401 }
402 402
403 IMEPropertyInfo::IMEPropertyInfo()
404 : selected(false) {
405 }
406
407 IMEPropertyInfo::~IMEPropertyInfo() {
408 }
409
403 SystemTray::SystemTray() 410 SystemTray::SystemTray()
404 : items_(), 411 : items_(),
405 accessibility_observer_(NULL), 412 accessibility_observer_(NULL),
406 audio_observer_(NULL), 413 audio_observer_(NULL),
407 bluetooth_observer_(NULL), 414 bluetooth_observer_(NULL),
408 brightness_observer_(NULL), 415 brightness_observer_(NULL),
409 caps_lock_observer_(NULL), 416 caps_lock_observer_(NULL),
410 clock_observer_(NULL), 417 clock_observer_(NULL),
411 ime_observer_(NULL), 418 ime_observer_(NULL),
412 network_observer_(NULL), 419 network_observer_(NULL),
(...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after
592 } 599 }
593 600
594 void SystemTray::UpdateBackground(int alpha) { 601 void SystemTray::UpdateBackground(int alpha) {
595 if (mouse_in_tray_) 602 if (mouse_in_tray_)
596 alpha += kTrayBackgroundHoverAlpha - kTrayBackgroundAlpha; 603 alpha += kTrayBackgroundHoverAlpha - kTrayBackgroundAlpha;
597 background_->set_alpha(alpha); 604 background_->set_alpha(alpha);
598 SchedulePaint(); 605 SchedulePaint();
599 } 606 }
600 607
601 } // namespace ash 608 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698