OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 "chrome/browser/chromeos/input_method/mode_indicator_controller.h" | 5 #include "chrome/browser/chromeos/input_method/mode_indicator_controller.h" |
6 | 6 |
7 #include "ash/common/shell_window_ids.h" | 7 #include "ash/public/cpp/shell_window_ids.h" |
8 #include "ash/shell.h" | 8 #include "ash/shell.h" |
9 #include "ash/wm/window_util.h" | 9 #include "ash/wm/window_util.h" |
10 #include "base/logging.h" | 10 #include "base/logging.h" |
11 #include "base/strings/utf_string_conversions.h" | 11 #include "base/strings/utf_string_conversions.h" |
12 #include "chrome/browser/chromeos/input_method/input_method_util.h" | 12 #include "chrome/browser/chromeos/input_method/input_method_util.h" |
13 #include "ui/chromeos/ime/mode_indicator_view.h" | 13 #include "ui/chromeos/ime/mode_indicator_view.h" |
14 | 14 |
15 namespace chromeos { | 15 namespace chromeos { |
16 namespace input_method { | 16 namespace input_method { |
17 | 17 |
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
116 views::Widget* mi_widget = mi_view->GetWidget(); | 116 views::Widget* mi_widget = mi_view->GetWidget(); |
117 if (GetModeIndicatorObserverForTesting()) | 117 if (GetModeIndicatorObserverForTesting()) |
118 GetModeIndicatorObserverForTesting()->AddModeIndicatorWidget(mi_widget); | 118 GetModeIndicatorObserverForTesting()->AddModeIndicatorWidget(mi_widget); |
119 | 119 |
120 mi_observer_->AddModeIndicatorWidget(mi_widget); | 120 mi_observer_->AddModeIndicatorWidget(mi_widget); |
121 mi_view->ShowAndFadeOut(); | 121 mi_view->ShowAndFadeOut(); |
122 } | 122 } |
123 | 123 |
124 } // namespace input_method | 124 } // namespace input_method |
125 } // namespace chromeos | 125 } // namespace chromeos |
OLD | NEW |