| OLD | NEW |
| 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/widget/native_widget_aura.h" | 5 #include "ui/views/widget/native_widget_aura.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/string_util.h" | 8 #include "base/string_util.h" |
| 9 #include "third_party/skia/include/core/SkRegion.h" | 9 #include "third_party/skia/include/core/SkRegion.h" |
| 10 #include "ui/aura/client/activation_change_observer.h" | 10 #include "ui/aura/client/activation_change_observer.h" |
| (...skipping 14 matching lines...) Expand all Loading... |
| 25 #include "ui/base/events/event.h" | 25 #include "ui/base/events/event.h" |
| 26 #include "ui/base/native_theme/native_theme_aura.h" | 26 #include "ui/base/native_theme/native_theme_aura.h" |
| 27 #include "ui/base/ui_base_types.h" | 27 #include "ui/base/ui_base_types.h" |
| 28 #include "ui/compositor/layer.h" | 28 #include "ui/compositor/layer.h" |
| 29 #include "ui/gfx/canvas.h" | 29 #include "ui/gfx/canvas.h" |
| 30 #include "ui/gfx/font.h" | 30 #include "ui/gfx/font.h" |
| 31 #include "ui/gfx/screen.h" | 31 #include "ui/gfx/screen.h" |
| 32 #include "ui/views/drag_utils.h" | 32 #include "ui/views/drag_utils.h" |
| 33 #include "ui/views/ime/input_method_bridge.h" | 33 #include "ui/views/ime/input_method_bridge.h" |
| 34 #include "ui/views/views_delegate.h" | 34 #include "ui/views/views_delegate.h" |
| 35 #include "ui/views/widget/desktop_native_widget_aura.h" | 35 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h" |
| 36 #include "ui/views/widget/drop_helper.h" | 36 #include "ui/views/widget/drop_helper.h" |
| 37 #include "ui/views/widget/native_widget_aura_window_observer.h" | 37 #include "ui/views/widget/native_widget_aura_window_observer.h" |
| 38 #include "ui/views/widget/native_widget_delegate.h" | 38 #include "ui/views/widget/native_widget_delegate.h" |
| 39 #include "ui/views/widget/root_view.h" | 39 #include "ui/views/widget/root_view.h" |
| 40 #include "ui/views/widget/tooltip_manager_aura.h" | 40 #include "ui/views/widget/tooltip_manager_aura.h" |
| 41 #include "ui/views/widget/widget_aura_utils.h" | 41 #include "ui/views/widget/widget_aura_utils.h" |
| 42 #include "ui/views/widget/widget_delegate.h" | 42 #include "ui/views/widget/widget_delegate.h" |
| 43 | 43 |
| 44 #if defined(OS_WIN) | 44 #if defined(OS_WIN) |
| 45 #include "base/win/scoped_gdi_object.h" | 45 #include "base/win/scoped_gdi_object.h" |
| 46 #include "base/win/win_util.h" | 46 #include "base/win/win_util.h" |
| 47 #include "ui/base/l10n/l10n_util_win.h" | 47 #include "ui/base/l10n/l10n_util_win.h" |
| 48 #include "ui/views/widget/desktop_root_window_host_win.h" | 48 #include "ui/views/widget/desktop_aura/desktop_root_window_host_win.h" |
| 49 #endif | 49 #endif |
| 50 | 50 |
| 51 #if !defined(OS_CHROMEOS) | 51 #if !defined(OS_CHROMEOS) |
| 52 #include "ui/views/widget/desktop_root_window_host.h" | 52 #include "ui/views/widget/desktop_aura/desktop_root_window_host.h" |
| 53 #endif | 53 #endif |
| 54 | 54 |
| 55 namespace views { | 55 namespace views { |
| 56 | 56 |
| 57 namespace { | 57 namespace { |
| 58 | 58 |
| 59 void SetRestoreBounds(aura::Window* window, const gfx::Rect& bounds) { | 59 void SetRestoreBounds(aura::Window* window, const gfx::Rect& bounds) { |
| 60 window->SetProperty(aura::client::kRestoreBoundsKey, new gfx::Rect(bounds)); | 60 window->SetProperty(aura::client::kRestoreBoundsKey, new gfx::Rect(bounds)); |
| 61 } | 61 } |
| 62 | 62 |
| (...skipping 952 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1015 return aura::Env::GetInstance()->is_mouse_button_down(); | 1015 return aura::Env::GetInstance()->is_mouse_button_down(); |
| 1016 } | 1016 } |
| 1017 | 1017 |
| 1018 // static | 1018 // static |
| 1019 bool NativeWidgetPrivate::IsTouchDown() { | 1019 bool NativeWidgetPrivate::IsTouchDown() { |
| 1020 return aura::Env::GetInstance()->is_touch_down(); | 1020 return aura::Env::GetInstance()->is_touch_down(); |
| 1021 } | 1021 } |
| 1022 | 1022 |
| 1023 } // namespace internal | 1023 } // namespace internal |
| 1024 } // namespace views | 1024 } // namespace views |
| OLD | NEW |