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

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

Issue 10008043: Allow non-radio button properties in uber tray. Simplified chinese will use it. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rewrite ActivateIMEProperty Created 8 years, 8 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 398 matching lines...) Expand 10 before | Expand all | Expand 10 after
409 } 409 }
410 410
411 IMEInfo::IMEInfo() 411 IMEInfo::IMEInfo()
412 : selected(false) { 412 : selected(false) {
413 } 413 }
414 414
415 IMEInfo::~IMEInfo() { 415 IMEInfo::~IMEInfo() {
416 } 416 }
417 417
418 IMEPropertyInfo::IMEPropertyInfo() 418 IMEPropertyInfo::IMEPropertyInfo()
419 : selected(false) { 419 : selected(false), is_selection(false) {
sky 2012/04/09 15:18:56 wrap is_selection to the next line.
Jun Mukai 2012/04/10 02:13:46 Done.
420 } 420 }
421 421
422 IMEPropertyInfo::~IMEPropertyInfo() { 422 IMEPropertyInfo::~IMEPropertyInfo() {
423 } 423 }
424 424
425 SystemTray::SystemTray() 425 SystemTray::SystemTray()
426 : items_(), 426 : items_(),
427 accessibility_observer_(NULL), 427 accessibility_observer_(NULL),
428 audio_observer_(NULL), 428 audio_observer_(NULL),
429 bluetooth_observer_(NULL), 429 bluetooth_observer_(NULL),
(...skipping 230 matching lines...) Expand 10 before | Expand all | Expand 10 after
660 popup_->Hide(); 660 popup_->Hide();
661 } 661 }
662 } 662 }
663 return base::EVENT_CONTINUE; 663 return base::EVENT_CONTINUE;
664 } 664 }
665 665
666 void SystemTray::DidProcessEvent(const base::NativeEvent& event) { 666 void SystemTray::DidProcessEvent(const base::NativeEvent& event) {
667 } 667 }
668 668
669 } // namespace ash 669 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698