| 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/common/system/chromeos/tray_caps_lock.h" | 5 #include "ash/system/tray_caps_lock.h" |
| 6 | 6 |
| 7 #include "ash/common/accessibility_delegate.h" | 7 #include "ash/common/accessibility_delegate.h" |
| 8 #include "ash/common/system/tray/actionable_view.h" | |
| 9 #include "ash/common/system/tray/system_tray_delegate.h" | |
| 10 #include "ash/common/system/tray/tray_constants.h" | |
| 11 #include "ash/common/system/tray/tray_popup_item_style.h" | |
| 12 #include "ash/common/system/tray/tray_popup_utils.h" | |
| 13 #include "ash/common/system/tray/tri_view.h" | |
| 14 #include "ash/common/wm_shell.h" | 8 #include "ash/common/wm_shell.h" |
| 15 #include "ash/resources/grit/ash_resources.h" | 9 #include "ash/resources/grit/ash_resources.h" |
| 16 #include "ash/resources/vector_icons/vector_icons.h" | 10 #include "ash/resources/vector_icons/vector_icons.h" |
| 17 #include "ash/strings/grit/ash_strings.h" | 11 #include "ash/strings/grit/ash_strings.h" |
| 12 #include "ash/system/tray/actionable_view.h" |
| 13 #include "ash/system/tray/system_tray_delegate.h" |
| 14 #include "ash/system/tray/tray_constants.h" |
| 15 #include "ash/system/tray/tray_popup_item_style.h" |
| 16 #include "ash/system/tray/tray_popup_utils.h" |
| 17 #include "ash/system/tray/tri_view.h" |
| 18 #include "base/sys_info.h" | 18 #include "base/sys_info.h" |
| 19 #include "ui/accessibility/ax_node_data.h" | 19 #include "ui/accessibility/ax_node_data.h" |
| 20 #include "ui/base/ime/chromeos/ime_keyboard.h" | 20 #include "ui/base/ime/chromeos/ime_keyboard.h" |
| 21 #include "ui/base/ime/chromeos/input_method_manager.h" | 21 #include "ui/base/ime/chromeos/input_method_manager.h" |
| 22 #include "ui/base/l10n/l10n_util.h" | 22 #include "ui/base/l10n/l10n_util.h" |
| 23 #include "ui/base/resource/resource_bundle.h" | 23 #include "ui/base/resource/resource_bundle.h" |
| 24 #include "ui/gfx/image/image.h" | 24 #include "ui/gfx/image/image.h" |
| 25 #include "ui/gfx/paint_vector_icon.h" | 25 #include "ui/gfx/paint_vector_icon.h" |
| 26 #include "ui/views/border.h" | 26 #include "ui/views/border.h" |
| 27 #include "ui/views/controls/image_view.h" | 27 #include "ui/views/controls/image_view.h" |
| (...skipping 195 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 223 | 223 |
| 224 void TrayCapsLock::DestroyDefaultView() { | 224 void TrayCapsLock::DestroyDefaultView() { |
| 225 default_ = nullptr; | 225 default_ = nullptr; |
| 226 } | 226 } |
| 227 | 227 |
| 228 void TrayCapsLock::DestroyDetailedView() { | 228 void TrayCapsLock::DestroyDetailedView() { |
| 229 detailed_ = nullptr; | 229 detailed_ = nullptr; |
| 230 } | 230 } |
| 231 | 231 |
| 232 } // namespace ash | 232 } // namespace ash |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 2732813002:
chromeos: Move files in //ash/common to //ash, part 1 (Closed)
