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

Side by Side Diff: ash/system/virtual_keyboard/virtual_keyboard_tray.h

Issue 2734733002: Revert "chromeos: Move files in //ash/common to //ash, part 3" (Closed)
Patch Set: 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/user/user_view.cc ('k') | ash/system/virtual_keyboard/virtual_keyboard_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 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 #ifndef ASH_SYSTEM_VIRTUAL_KEYBOARD_VIRTUAL_KEYBOARD_TRAY_H_ 5 #ifndef ASH_SYSTEM_VIRTUAL_KEYBOARD_VIRTUAL_KEYBOARD_TRAY_H_
6 #define ASH_SYSTEM_VIRTUAL_KEYBOARD_VIRTUAL_KEYBOARD_TRAY_H_ 6 #define ASH_SYSTEM_VIRTUAL_KEYBOARD_VIRTUAL_KEYBOARD_TRAY_H_
7 7
8 #include "ash/keyboard/keyboard_ui_observer.h" 8 #include "ash/common/keyboard/keyboard_ui_observer.h"
9 #include "ash/system/tray/tray_background_view.h" 9 #include "ash/system/tray/tray_background_view.h"
10 #include "base/macros.h" 10 #include "base/macros.h"
11 #include "ui/keyboard/keyboard_controller_observer.h" 11 #include "ui/keyboard/keyboard_controller_observer.h"
12 12
13 namespace views { 13 namespace views {
14 class ImageView; 14 class ImageView;
15 } 15 }
16 16
17 namespace ash { 17 namespace ash {
18 18
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 views::ImageView* icon_; 50 views::ImageView* icon_;
51 51
52 WmShelf* wm_shelf_; 52 WmShelf* wm_shelf_;
53 53
54 DISALLOW_COPY_AND_ASSIGN(VirtualKeyboardTray); 54 DISALLOW_COPY_AND_ASSIGN(VirtualKeyboardTray);
55 }; 55 };
56 56
57 } // namespace ash 57 } // namespace ash
58 58
59 #endif // ASH_SYSTEM_VIRTUAL_KEYBOARD_VIRTUAL_KEYBOARD_TRAY_H_ 59 #endif // ASH_SYSTEM_VIRTUAL_KEYBOARD_VIRTUAL_KEYBOARD_TRAY_H_
OLDNEW
« no previous file with comments | « ash/system/user/user_view.cc ('k') | ash/system/virtual_keyboard/virtual_keyboard_tray.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698