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

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

Issue 2507963002: Implement hit tests/client area. (Closed)
Patch Set: add it back Created 4 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
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/desktop_aura/desktop_native_widget_aura.h" 5 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "base/trace_event/trace_event.h" 9 #include "base/trace_event/trace_event.h"
10 #include "build/build_config.h" 10 #include "build/build_config.h"
(...skipping 27 matching lines...) Expand all
38 #include "ui/views/widget/desktop_aura/desktop_window_tree_host.h" 38 #include "ui/views/widget/desktop_aura/desktop_window_tree_host.h"
39 #include "ui/views/widget/drop_helper.h" 39 #include "ui/views/widget/drop_helper.h"
40 #include "ui/views/widget/focus_manager_event_handler.h" 40 #include "ui/views/widget/focus_manager_event_handler.h"
41 #include "ui/views/widget/native_widget_aura.h" 41 #include "ui/views/widget/native_widget_aura.h"
42 #include "ui/views/widget/root_view.h" 42 #include "ui/views/widget/root_view.h"
43 #include "ui/views/widget/tooltip_manager_aura.h" 43 #include "ui/views/widget/tooltip_manager_aura.h"
44 #include "ui/views/widget/widget.h" 44 #include "ui/views/widget/widget.h"
45 #include "ui/views/widget/widget_aura_utils.h" 45 #include "ui/views/widget/widget_aura_utils.h"
46 #include "ui/views/widget/widget_delegate.h" 46 #include "ui/views/widget/widget_delegate.h"
47 #include "ui/views/widget/window_reorderer.h" 47 #include "ui/views/widget/window_reorderer.h"
48 #include "ui/views/window/native_frame_view.h"
49 #include "ui/wm/core/compound_event_filter.h" 48 #include "ui/wm/core/compound_event_filter.h"
50 #include "ui/wm/core/cursor_manager.h" 49 #include "ui/wm/core/cursor_manager.h"
51 #include "ui/wm/core/focus_controller.h" 50 #include "ui/wm/core/focus_controller.h"
52 #include "ui/wm/core/native_cursor_manager.h" 51 #include "ui/wm/core/native_cursor_manager.h"
53 #include "ui/wm/core/shadow_controller.h" 52 #include "ui/wm/core/shadow_controller.h"
54 #include "ui/wm/core/shadow_types.h" 53 #include "ui/wm/core/shadow_types.h"
55 #include "ui/wm/core/visibility_controller.h" 54 #include "ui/wm/core/visibility_controller.h"
56 #include "ui/wm/core/window_animations.h" 55 #include "ui/wm/core/window_animations.h"
57 #include "ui/wm/core/window_modality_controller.h" 56 #include "ui/wm/core/window_modality_controller.h"
58 #include "ui/wm/public/activation_client.h" 57 #include "ui/wm/public/activation_client.h"
(...skipping 469 matching lines...) Expand 10 before | Expand all | Expand 10 after
528 527
529 OnSizeConstraintsChanged(); 528 OnSizeConstraintsChanged();
530 529
531 window_reorderer_.reset(new WindowReorderer(content_window_, 530 window_reorderer_.reset(new WindowReorderer(content_window_,
532 GetWidget()->GetRootView())); 531 GetWidget()->GetRootView()));
533 } 532 }
534 533
535 void DesktopNativeWidgetAura::OnWidgetInitDone() {} 534 void DesktopNativeWidgetAura::OnWidgetInitDone() {}
536 535
537 NonClientFrameView* DesktopNativeWidgetAura::CreateNonClientFrameView() { 536 NonClientFrameView* DesktopNativeWidgetAura::CreateNonClientFrameView() {
538 return ShouldUseNativeFrame() ? new NativeFrameView(GetWidget()) : NULL; 537 return desktop_window_tree_host_->CreateNonClientFrameView();
539 } 538 }
540 539
541 bool DesktopNativeWidgetAura::ShouldUseNativeFrame() const { 540 bool DesktopNativeWidgetAura::ShouldUseNativeFrame() const {
542 return desktop_window_tree_host_->ShouldUseNativeFrame(); 541 return desktop_window_tree_host_->ShouldUseNativeFrame();
543 } 542 }
544 543
545 bool DesktopNativeWidgetAura::ShouldWindowContentsBeTransparent() const { 544 bool DesktopNativeWidgetAura::ShouldWindowContentsBeTransparent() const {
546 return desktop_window_tree_host_->ShouldWindowContentsBeTransparent(); 545 return desktop_window_tree_host_->ShouldWindowContentsBeTransparent();
547 } 546 }
548 547
(...skipping 649 matching lines...) Expand 10 before | Expand all | Expand 10 after
1198 if (cursor_reference_count_ == 0) { 1197 if (cursor_reference_count_ == 0) {
1199 // We are the last DesktopNativeWidgetAura instance, and we are responsible 1198 // We are the last DesktopNativeWidgetAura instance, and we are responsible
1200 // for cleaning up |cursor_manager_|. 1199 // for cleaning up |cursor_manager_|.
1201 delete cursor_manager_; 1200 delete cursor_manager_;
1202 native_cursor_manager_ = NULL; 1201 native_cursor_manager_ = NULL;
1203 cursor_manager_ = NULL; 1202 cursor_manager_ = NULL;
1204 } 1203 }
1205 } 1204 }
1206 1205
1207 } // namespace views 1206 } // namespace views
OLDNEW
« no previous file with comments | « ui/views/mus/mus_client_observer.h ('k') | ui/views/widget/desktop_aura/desktop_window_tree_host.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698