| 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/ime/tray_ime.h" | 5 #include "ash/system/ime/tray_ime.h" |
| 6 | 6 |
| 7 #include <vector> | 7 #include <vector> |
| 8 | 8 |
| 9 #include "ash/metrics/user_metrics_recorder.h" | 9 #include "ash/metrics/user_metrics_recorder.h" |
| 10 #include "ash/root_window_controller.h" | 10 #include "ash/root_window_controller.h" |
| (...skipping 14 matching lines...) Expand all Loading... |
| 25 #include "grit/ash_strings.h" | 25 #include "grit/ash_strings.h" |
| 26 #include "ui/base/l10n/l10n_util.h" | 26 #include "ui/base/l10n/l10n_util.h" |
| 27 #include "ui/base/resource/resource_bundle.h" | 27 #include "ui/base/resource/resource_bundle.h" |
| 28 #include "ui/gfx/font.h" | 28 #include "ui/gfx/font.h" |
| 29 #include "ui/gfx/image/image.h" | 29 #include "ui/gfx/image/image.h" |
| 30 #include "ui/views/controls/label.h" | 30 #include "ui/views/controls/label.h" |
| 31 #include "ui/views/layout/box_layout.h" | 31 #include "ui/views/layout/box_layout.h" |
| 32 #include "ui/views/widget/widget.h" | 32 #include "ui/views/widget/widget.h" |
| 33 | 33 |
| 34 namespace ash { | 34 namespace ash { |
| 35 namespace internal { | |
| 36 namespace tray { | 35 namespace tray { |
| 37 | 36 |
| 38 class IMEDefaultView : public TrayItemMore { | 37 class IMEDefaultView : public TrayItemMore { |
| 39 public: | 38 public: |
| 40 explicit IMEDefaultView(SystemTrayItem* owner) | 39 explicit IMEDefaultView(SystemTrayItem* owner) |
| 41 : TrayItemMore(owner, true) { | 40 : TrayItemMore(owner, true) { |
| 42 ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance(); | 41 ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance(); |
| 43 | 42 |
| 44 SetImage(bundle.GetImageNamed( | 43 SetImage(bundle.GetImageNamed( |
| 45 IDR_AURA_UBER_TRAY_IME).ToImageSkia()); | 44 IDR_AURA_UBER_TRAY_IME).ToImageSkia()); |
| (...skipping 217 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 263 delegate->GetCurrentIMEProperties(&property_list); | 262 delegate->GetCurrentIMEProperties(&property_list); |
| 264 | 263 |
| 265 UpdateTrayLabel(current, list.size()); | 264 UpdateTrayLabel(current, list.size()); |
| 266 | 265 |
| 267 if (default_) | 266 if (default_) |
| 268 default_->UpdateLabel(current); | 267 default_->UpdateLabel(current); |
| 269 if (detailed_) | 268 if (detailed_) |
| 270 detailed_->Update(list, property_list); | 269 detailed_->Update(list, property_list); |
| 271 } | 270 } |
| 272 | 271 |
| 273 } // namespace internal | |
| 274 } // namespace ash | 272 } // namespace ash |
| OLD | NEW |