Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(569)

Side by Side Diff: ash/system/ime_menu/ime_menu_tray.h

Issue 2732813002: chromeos: Move files in //ash/common to //ash, part 1 (Closed)
Patch Set: rebase Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « ash/system/ime_menu/ime_list_view.cc ('k') | ash/system/ime_menu/ime_menu_tray.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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 #ifndef ASH_COMMON_SYSTEM_CHROMEOS_IME_MENU_IME_MENU_TRAY_H_ 5 #ifndef ASH_SYSTEM_IME_MENU_IME_MENU_TRAY_H_
6 #define ASH_COMMON_SYSTEM_CHROMEOS_IME_MENU_IME_MENU_TRAY_H_ 6 #define ASH_SYSTEM_IME_MENU_IME_MENU_TRAY_H_
7 7
8 #include "ash/ash_export.h" 8 #include "ash/ash_export.h"
9 #include "ash/common/system/chromeos/virtual_keyboard/virtual_keyboard_observer. h" 9 #include "ash/system/ime/ime_observer.h"
10 #include "ash/common/system/ime/ime_observer.h" 10 #include "ash/system/tray/ime_info.h"
11 #include "ash/common/system/tray/ime_info.h" 11 #include "ash/system/tray/tray_background_view.h"
12 #include "ash/common/system/tray/tray_background_view.h" 12 #include "ash/system/tray/tray_bubble_wrapper.h"
13 #include "ash/common/system/tray/tray_bubble_wrapper.h" 13 #include "ash/system/virtual_keyboard/virtual_keyboard_observer.h"
14 #include "base/macros.h" 14 #include "base/macros.h"
15 #include "ui/keyboard/keyboard_controller_observer.h" 15 #include "ui/keyboard/keyboard_controller_observer.h"
16 #include "ui/views/bubble/tray_bubble_view.h" 16 #include "ui/views/bubble/tray_bubble_view.h"
17 17
18 namespace views { 18 namespace views {
19 class Label; 19 class Label;
20 } // namespace views 20 } // namespace views
21 21
22 namespace ash { 22 namespace ash {
23 class ImeListView; 23 class ImeListView;
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
108 bool force_show_keyboard_; 108 bool force_show_keyboard_;
109 bool should_block_shelf_auto_hide_; 109 bool should_block_shelf_auto_hide_;
110 bool keyboard_suppressed_; 110 bool keyboard_suppressed_;
111 bool show_bubble_after_keyboard_hidden_; 111 bool show_bubble_after_keyboard_hidden_;
112 112
113 DISALLOW_COPY_AND_ASSIGN(ImeMenuTray); 113 DISALLOW_COPY_AND_ASSIGN(ImeMenuTray);
114 }; 114 };
115 115
116 } // namespace ash 116 } // namespace ash
117 117
118 #endif // ASH_COMMON_SYSTEM_CHROMEOS_IME_MENU_IME_MENU_TRAY_H_ 118 #endif // ASH_SYSTEM_IME_MENU_IME_MENU_TRAY_H_
OLDNEW
« no previous file with comments | « ash/system/ime_menu/ime_list_view.cc ('k') | ash/system/ime_menu/ime_menu_tray.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698