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

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

Issue 23533057: Makes native_widget_types forward declare ui::Cursor. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix linux_aura Created 7 years, 3 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 | Annotate | Revision Log
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/widget/widget.h" 5 #include "ui/views/widget/widget.h"
6 6
7 #include "base/debug/trace_event.h" 7 #include "base/debug/trace_event.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/message_loop/message_loop.h" 9 #include "base/message_loop/message_loop.h"
10 #include "base/strings/utf_string_conversions.h" 10 #include "base/strings/utf_string_conversions.h"
(...skipping 13 matching lines...) Expand all
24 #include "ui/views/views_delegate.h" 24 #include "ui/views/views_delegate.h"
25 #include "ui/views/widget/native_widget_private.h" 25 #include "ui/views/widget/native_widget_private.h"
26 #include "ui/views/widget/root_view.h" 26 #include "ui/views/widget/root_view.h"
27 #include "ui/views/widget/tooltip_manager.h" 27 #include "ui/views/widget/tooltip_manager.h"
28 #include "ui/views/widget/widget_delegate.h" 28 #include "ui/views/widget/widget_delegate.h"
29 #include "ui/views/widget/widget_deletion_observer.h" 29 #include "ui/views/widget/widget_deletion_observer.h"
30 #include "ui/views/widget/widget_observer.h" 30 #include "ui/views/widget/widget_observer.h"
31 #include "ui/views/window/custom_frame_view.h" 31 #include "ui/views/window/custom_frame_view.h"
32 #include "ui/views/window/dialog_delegate.h" 32 #include "ui/views/window/dialog_delegate.h"
33 33
34 #if defined(USE_AURA)
35 #include "ui/base/cursor/cursor.h"
36 #endif
37
34 #if !defined(OS_MACOSX) 38 #if !defined(OS_MACOSX)
35 #include "ui/views/controls/menu/menu_controller.h" 39 #include "ui/views/controls/menu/menu_controller.h"
36 #endif 40 #endif
37 41
38 namespace views { 42 namespace views {
39 43
40 namespace { 44 namespace {
41 45
42 // If |view| has a layer the layer is added to |layers|. Else this recurses 46 // If |view| has a layer the layer is added to |layers|. Else this recurses
43 // through the children. This is used to build a list of the layers created by 47 // through the children. This is used to build a list of the layers created by
(...skipping 1393 matching lines...) Expand 10 before | Expand all | Expand 10 after
1437 1441
1438 //////////////////////////////////////////////////////////////////////////////// 1442 ////////////////////////////////////////////////////////////////////////////////
1439 // internal::NativeWidgetPrivate, NativeWidget implementation: 1443 // internal::NativeWidgetPrivate, NativeWidget implementation:
1440 1444
1441 internal::NativeWidgetPrivate* NativeWidgetPrivate::AsNativeWidgetPrivate() { 1445 internal::NativeWidgetPrivate* NativeWidgetPrivate::AsNativeWidgetPrivate() {
1442 return this; 1446 return this;
1443 } 1447 }
1444 1448
1445 } // namespace internal 1449 } // namespace internal
1446 } // namespace views 1450 } // namespace views
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698