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

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

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 #include "ui/views/controls/combobox/combobox.h" 5 #include "ui/views/controls/combobox/combobox.h"
6 6
7 #include <stddef.h>
8
7 #include <utility> 9 #include <utility>
8 10
9 #include "base/logging.h" 11 #include "base/logging.h"
12 #include "base/macros.h"
13 #include "build/build_config.h"
10 #include "ui/accessibility/ax_view_state.h" 14 #include "ui/accessibility/ax_view_state.h"
11 #include "ui/base/ime/input_method.h" 15 #include "ui/base/ime/input_method.h"
12 #include "ui/base/models/combobox_model.h" 16 #include "ui/base/models/combobox_model.h"
13 #include "ui/base/models/combobox_model_observer.h" 17 #include "ui/base/models/combobox_model_observer.h"
14 #include "ui/base/resource/resource_bundle.h" 18 #include "ui/base/resource/resource_bundle.h"
15 #include "ui/events/event.h" 19 #include "ui/events/event.h"
16 #include "ui/gfx/animation/throb_animation.h" 20 #include "ui/gfx/animation/throb_animation.h"
17 #include "ui/gfx/canvas.h" 21 #include "ui/gfx/canvas.h"
18 #include "ui/gfx/color_palette.h" 22 #include "ui/gfx/color_palette.h"
19 #include "ui/gfx/scoped_canvas.h" 23 #include "ui/gfx/scoped_canvas.h"
(...skipping 902 matching lines...) Expand 10 before | Expand all | Expand 10 after
922 return gfx::Size(width, font_list.GetHeight()); 926 return gfx::Size(width, font_list.GetHeight());
923 } 927 }
924 928
925 PrefixSelector* Combobox::GetPrefixSelector() { 929 PrefixSelector* Combobox::GetPrefixSelector() {
926 if (!selector_) 930 if (!selector_)
927 selector_.reset(new PrefixSelector(this)); 931 selector_.reset(new PrefixSelector(this));
928 return selector_.get(); 932 return selector_.get();
929 } 933 }
930 934
931 } // namespace views 935 } // namespace views
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698