| OLD | NEW |
| 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 418 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 429 } | 429 } |
| 430 | 430 |
| 431 IMEInfo::IMEInfo() | 431 IMEInfo::IMEInfo() |
| 432 : selected(false) { | 432 : selected(false) { |
| 433 } | 433 } |
| 434 | 434 |
| 435 IMEInfo::~IMEInfo() { | 435 IMEInfo::~IMEInfo() { |
| 436 } | 436 } |
| 437 | 437 |
| 438 IMEPropertyInfo::IMEPropertyInfo() | 438 IMEPropertyInfo::IMEPropertyInfo() |
| 439 : selected(false), | 439 : selected(false) { |
| 440 is_selection(false) { | |
| 441 } | 440 } |
| 442 | 441 |
| 443 IMEPropertyInfo::~IMEPropertyInfo() { | 442 IMEPropertyInfo::~IMEPropertyInfo() { |
| 444 } | 443 } |
| 445 | 444 |
| 446 SystemTray::SystemTray() | 445 SystemTray::SystemTray() |
| 447 : items_(), | 446 : items_(), |
| 448 accessibility_observer_(NULL), | 447 accessibility_observer_(NULL), |
| 449 audio_observer_(NULL), | 448 audio_observer_(NULL), |
| 450 bluetooth_observer_(NULL), | 449 bluetooth_observer_(NULL), |
| (...skipping 230 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 681 popup_->Hide(); | 680 popup_->Hide(); |
| 682 } | 681 } |
| 683 } | 682 } |
| 684 return base::EVENT_CONTINUE; | 683 return base::EVENT_CONTINUE; |
| 685 } | 684 } |
| 686 | 685 |
| 687 void SystemTray::DidProcessEvent(const base::NativeEvent& event) { | 686 void SystemTray::DidProcessEvent(const base::NativeEvent& event) { |
| 688 } | 687 } |
| 689 | 688 |
| 690 } // namespace ash | 689 } // namespace ash |
| OLD | NEW |