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

Side by Side Diff: views/widget/native_widget_aura.cc

Issue 8581003: views: Move ime and test directories to ui/views. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix linux Created 9 years, 1 month 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
« no previous file with comments | « views/views.gyp ('k') | views/widget/native_widget_gtk.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 (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 "views/widget/native_widget_aura.h" 5 #include "views/widget/native_widget_aura.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "ui/aura/client/aura_constants.h" 8 #include "ui/aura/client/aura_constants.h"
9 #include "ui/aura/desktop.h" 9 #include "ui/aura/desktop.h"
10 #include "ui/aura/desktop_observer.h" 10 #include "ui/aura/desktop_observer.h"
11 #include "ui/aura/event.h" 11 #include "ui/aura/event.h"
12 #include "ui/aura/window.h" 12 #include "ui/aura/window.h"
13 #include "ui/aura/window_types.h" 13 #include "ui/aura/window_types.h"
14 #include "ui/base/ui_base_types.h" 14 #include "ui/base/ui_base_types.h"
15 #include "ui/gfx/canvas.h" 15 #include "ui/gfx/canvas.h"
16 #include "ui/gfx/compositor/layer.h" 16 #include "ui/gfx/compositor/layer.h"
17 #include "ui/gfx/font.h" 17 #include "ui/gfx/font.h"
18 #include "ui/gfx/screen.h" 18 #include "ui/gfx/screen.h"
19 #include "views/widget/native_widget_delegate.h" 19 #include "views/widget/native_widget_delegate.h"
20 #include "views/widget/tooltip_manager_views.h" 20 #include "views/widget/tooltip_manager_views.h"
21 21
22 #if defined(OS_WIN) 22 #if defined(OS_WIN)
23 #include "base/win/scoped_gdi_object.h" 23 #include "base/win/scoped_gdi_object.h"
24 #include "base/win/win_util.h" 24 #include "base/win/win_util.h"
25 #include "ui/base/l10n/l10n_util_win.h" 25 #include "ui/base/l10n/l10n_util_win.h"
26 #endif 26 #endif
27 27
28 #if defined(HAVE_IBUS) 28 #if defined(HAVE_IBUS)
29 #include "views/ime/input_method_ibus.h" 29 #include "ui/views/ime/input_method_ibus.h"
30 #else 30 #else
31 #include "views/ime/mock_input_method.h" 31 #include "ui/views/ime/mock_input_method.h"
32 #endif 32 #endif
33 33
34 namespace views { 34 namespace views {
35 35
36 namespace { 36 namespace {
37 37
38 aura::WindowType GetAuraWindowTypeForWidgetType(Widget::InitParams::Type type) { 38 aura::WindowType GetAuraWindowTypeForWidgetType(Widget::InitParams::Type type) {
39 switch (type) { 39 switch (type) {
40 case Widget::InitParams::TYPE_WINDOW: 40 case Widget::InitParams::TYPE_WINDOW:
41 return aura::WINDOW_TYPE_NORMAL; 41 return aura::WINDOW_TYPE_NORMAL;
(...skipping 680 matching lines...) Expand 10 before | Expand all | Expand 10 after
722 NOTIMPLEMENTED(); 722 NOTIMPLEMENTED();
723 } 723 }
724 724
725 // static 725 // static
726 bool NativeWidgetPrivate::IsMouseButtonDown() { 726 bool NativeWidgetPrivate::IsMouseButtonDown() {
727 return aura::Desktop::GetInstance()->IsMouseButtonDown(); 727 return aura::Desktop::GetInstance()->IsMouseButtonDown();
728 } 728 }
729 729
730 } // namespace internal 730 } // namespace internal
731 } // namespace views 731 } // namespace views
OLDNEW
« no previous file with comments | « views/views.gyp ('k') | views/widget/native_widget_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698