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

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

Issue 8771006: views: Move the remaining file from views/ to ui/views/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/native_combobox_views.h" 5 #include "ui/views/controls/combobox/native_combobox_views.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/utf_string_conversions.h" 10 #include "base/utf_string_conversions.h"
11 #include "ui/base/keycodes/keyboard_codes.h" 11 #include "ui/base/keycodes/keyboard_codes.h"
12 #include "ui/base/models/combobox_model.h" 12 #include "ui/base/models/combobox_model.h"
13 #include "ui/base/resource/resource_bundle.h" 13 #include "ui/base/resource/resource_bundle.h"
14 #include "ui/gfx/canvas.h" 14 #include "ui/gfx/canvas.h"
15 #include "ui/gfx/canvas_skia.h" 15 #include "ui/gfx/canvas_skia.h"
16 #include "ui/gfx/font.h" 16 #include "ui/gfx/font.h"
17 #include "ui/gfx/path.h" 17 #include "ui/gfx/path.h"
18 #include "ui/views/background.h"
19 #include "ui/views/border.h"
18 #include "ui/views/controls/combobox/combobox.h" 20 #include "ui/views/controls/combobox/combobox.h"
19 #include "ui/views/controls/focusable_border.h" 21 #include "ui/views/controls/focusable_border.h"
20 #include "ui/views/controls/menu/menu_runner.h" 22 #include "ui/views/controls/menu/menu_runner.h"
21 #include "ui/views/controls/menu/submenu_view.h" 23 #include "ui/views/controls/menu/submenu_view.h"
22 #include "ui/views/widget/root_view.h" 24 #include "ui/views/widget/root_view.h"
23 #include "ui/views/widget/widget.h" 25 #include "ui/views/widget/widget.h"
24 #include "views/background.h"
25 #include "views/border.h"
26 26
27 #if defined(OS_LINUX) 27 #if defined(OS_LINUX)
28 #include "ui/gfx/gtk_util.h" 28 #include "ui/gfx/gtk_util.h"
29 #endif 29 #endif
30 30
31 namespace { 31 namespace {
32 32
33 // Define the size of the insets. 33 // Define the size of the insets.
34 const int kTopInsetSize = 4; 34 const int kTopInsetSize = 4;
35 const int kLeftInsetSize = 4; 35 const int kLeftInsetSize = 4;
(...skipping 341 matching lines...) Expand 10 before | Expand all | Expand 10 after
377 377
378 #if defined(USE_AURA) 378 #if defined(USE_AURA)
379 // static 379 // static
380 NativeComboboxWrapper* NativeComboboxWrapper::CreateWrapper( 380 NativeComboboxWrapper* NativeComboboxWrapper::CreateWrapper(
381 Combobox* combobox) { 381 Combobox* combobox) {
382 return new NativeComboboxViews(combobox); 382 return new NativeComboboxViews(combobox);
383 } 383 }
384 #endif 384 #endif
385 385
386 } // namespace views 386 } // namespace views
OLDNEW
« no previous file with comments | « ui/views/controls/combobox/native_combobox_gtk.cc ('k') | ui/views/controls/combobox/native_combobox_wrapper.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698