OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/chromeos/virtual_keyboard/virtual_keyboard_tray.h" | 5 #include "ash/system/chromeos/virtual_keyboard/virtual_keyboard_tray.h" |
6 | 6 |
7 #include "ash/common/keyboard/keyboard_ui.h" | 7 #include "ash/common/keyboard/keyboard_ui.h" |
8 #include "ash/common/material_design/material_design_controller.h" | 8 #include "ash/common/material_design/material_design_controller.h" |
9 #include "ash/common/shelf/shelf_constants.h" | 9 #include "ash/common/shelf/shelf_constants.h" |
10 #include "ash/common/shelf/wm_shelf_util.h" | 10 #include "ash/common/shelf/wm_shelf_util.h" |
11 #include "ash/common/system/tray/tray_constants.h" | 11 #include "ash/common/system/tray/tray_constants.h" |
12 #include "ash/common/system/tray/tray_utils.h" | 12 #include "ash/common/system/tray/tray_utils.h" |
13 #include "ash/shelf/shelf.h" | |
14 #include "ash/shelf/shelf_util.h" | |
15 #include "ash/shell.h" | 13 #include "ash/shell.h" |
16 #include "ash/system/status_area_widget.h" | 14 #include "ash/system/status_area_widget.h" |
17 #include "ash/system/tray/system_tray_notifier.h" | 15 #include "ash/system/tray/system_tray_notifier.h" |
18 #include "grit/ash_resources.h" | 16 #include "grit/ash_resources.h" |
19 #include "grit/ash_strings.h" | 17 #include "grit/ash_strings.h" |
20 #include "ui/base/l10n/l10n_util.h" | 18 #include "ui/base/l10n/l10n_util.h" |
21 #include "ui/base/resource/resource_bundle.h" | 19 #include "ui/base/resource/resource_bundle.h" |
22 #include "ui/events/event.h" | 20 #include "ui/events/event.h" |
23 #include "ui/gfx/image/image_skia.h" | 21 #include "ui/gfx/image/image_skia.h" |
24 #include "ui/gfx/paint_vector_icon.h" | 22 #include "ui/gfx/paint_vector_icon.h" |
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
104 const ui::Event& event) { | 102 const ui::Event& event) { |
105 DCHECK_EQ(button_, sender); | 103 DCHECK_EQ(button_, sender); |
106 PerformAction(event); | 104 PerformAction(event); |
107 } | 105 } |
108 | 106 |
109 void VirtualKeyboardTray::OnKeyboardEnabledStateChanged(bool new_value) { | 107 void VirtualKeyboardTray::OnKeyboardEnabledStateChanged(bool new_value) { |
110 SetVisible(Shell::GetInstance()->keyboard_ui()->IsEnabled()); | 108 SetVisible(Shell::GetInstance()->keyboard_ui()->IsEnabled()); |
111 } | 109 } |
112 | 110 |
113 } // namespace ash | 111 } // namespace ash |
OLD | NEW |