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

Side by Side Diff: ash/system/ime/tray_ime_chromeos.h

Issue 1540753002: Switch to standard integer types in ash/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: arraysize Created 5 years 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/date/tray_date.h ('k') | ash/system/locale/locale_notification_controller.h » ('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 2012 The Chromium Authors. All rights reserved. 1 // Copyright 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 #ifndef ASH_SYSTEM_IME_TRAY_IME_CHROMEOS_H_ 5 #ifndef ASH_SYSTEM_IME_TRAY_IME_CHROMEOS_H_
6 #define ASH_SYSTEM_IME_TRAY_IME_CHROMEOS_H_ 6 #define ASH_SYSTEM_IME_TRAY_IME_CHROMEOS_H_
7 7
8 #include <stddef.h>
9
8 #include "ash/system/chromeos/virtual_keyboard/virtual_keyboard_observer.h" 10 #include "ash/system/chromeos/virtual_keyboard/virtual_keyboard_observer.h"
9 #include "ash/system/ime/ime_observer.h" 11 #include "ash/system/ime/ime_observer.h"
10 #include "ash/system/tray/system_tray_delegate.h" 12 #include "ash/system/tray/system_tray_delegate.h"
11 #include "ash/system/tray/system_tray_item.h" 13 #include "ash/system/tray/system_tray_item.h"
12 #include "ash/system/tray_accessibility.h" 14 #include "ash/system/tray_accessibility.h"
15 #include "base/macros.h"
13 16
14 namespace views { 17 namespace views {
15 class Label; 18 class Label;
16 } 19 }
17 20
18 namespace ash { 21 namespace ash {
19 struct IMEInfo; 22 struct IMEInfo;
20 23
21 namespace tray { 24 namespace tray {
22 class IMEDefaultView; 25 class IMEDefaultView;
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 IMEInfoList ime_list_; 82 IMEInfoList ime_list_;
80 IMEInfo current_ime_; 83 IMEInfo current_ime_;
81 IMEPropertyInfoList property_list_; 84 IMEPropertyInfoList property_list_;
82 85
83 DISALLOW_COPY_AND_ASSIGN(TrayIME); 86 DISALLOW_COPY_AND_ASSIGN(TrayIME);
84 }; 87 };
85 88
86 } // namespace ash 89 } // namespace ash
87 90
88 #endif // ASH_SYSTEM_IME_TRAY_IME_CHROMEOS_H_ 91 #endif // ASH_SYSTEM_IME_TRAY_IME_CHROMEOS_H_
OLDNEW
« no previous file with comments | « ash/system/date/tray_date.h ('k') | ash/system/locale/locale_notification_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698