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

Side by Side Diff: ui/views/controls/combobox/combobox.h

Issue 1543173002: Switch to standard integer types in ui/views/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 12 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
OLDNEW
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 #ifndef UI_VIEWS_CONTROLS_COMBOBOX_COMBOBOX_H_ 5 #ifndef UI_VIEWS_CONTROLS_COMBOBOX_COMBOBOX_H_
6 #define UI_VIEWS_CONTROLS_COMBOBOX_COMBOBOX_H_ 6 #define UI_VIEWS_CONTROLS_COMBOBOX_COMBOBOX_H_
7 7
8 #include "base/macros.h"
8 #include "base/memory/weak_ptr.h" 9 #include "base/memory/weak_ptr.h"
9 #include "base/strings/string16.h" 10 #include "base/strings/string16.h"
10 #include "base/time/time.h" 11 #include "base/time/time.h"
11 #include "ui/views/controls/button/button.h" 12 #include "ui/views/controls/button/button.h"
12 #include "ui/views/controls/prefix_delegate.h" 13 #include "ui/views/controls/prefix_delegate.h"
13 14
14 namespace gfx { 15 namespace gfx {
15 class FontList; 16 class FontList;
16 } 17 }
17 18
(...skipping 182 matching lines...) Expand 10 before | Expand all | Expand 10 after
200 201
201 // Used for making calbacks. 202 // Used for making calbacks.
202 base::WeakPtrFactory<Combobox> weak_ptr_factory_; 203 base::WeakPtrFactory<Combobox> weak_ptr_factory_;
203 204
204 DISALLOW_COPY_AND_ASSIGN(Combobox); 205 DISALLOW_COPY_AND_ASSIGN(Combobox);
205 }; 206 };
206 207
207 } // namespace views 208 } // namespace views
208 209
209 #endif // UI_VIEWS_CONTROLS_COMBOBOX_COMBOBOX_H_ 210 #endif // UI_VIEWS_CONTROLS_COMBOBOX_COMBOBOX_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698