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/desktop_native_widget_helper_aura.h" | 5 #include "ui/views/widget/desktop_native_widget_helper_aura.h" |
6 | 6 |
7 #include "ui/aura/root_window.h" | 7 #include "ui/aura/root_window.h" |
8 #include "ui/aura/desktop/desktop_activation_client.h" | 8 #include "ui/aura/desktop/desktop_activation_client.h" |
9 #include "ui/aura/desktop/desktop_dispatcher_client.h" | 9 #include "ui/aura/desktop/desktop_dispatcher_client.h" |
10 #include "ui/aura/desktop/desktop_root_window_event_filter.h" | 10 #include "ui/aura/desktop/desktop_root_window_event_filter.h" |
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
45 if (bounds.IsEmpty()) { | 45 if (bounds.IsEmpty()) { |
46 // We must pass some non-zero value when we initialize a RootWindow. This | 46 // We must pass some non-zero value when we initialize a RootWindow. This |
47 // will probably be SetBounds()ed soon. | 47 // will probably be SetBounds()ed soon. |
48 bounds.set_size(gfx::Size(100, 100)); | 48 bounds.set_size(gfx::Size(100, 100)); |
49 } | 49 } |
50 root_window_.reset(new aura::RootWindow(bounds)); | 50 root_window_.reset(new aura::RootWindow(bounds)); |
51 root_window_->Init(); | 51 root_window_->Init(); |
52 root_window_->SetEventFilter( | 52 root_window_->SetEventFilter( |
53 new aura::DesktopRootWindowEventFilter(root_window_.get())); | 53 new aura::DesktopRootWindowEventFilter(root_window_.get())); |
54 root_window_->AddRootWindowObserver(this); | 54 root_window_->AddRootWindowObserver(this); |
| 55 root_window_->SetUseOSWindowBorders(false); |
55 | 56 |
56 aura::client::SetActivationClient( | 57 aura::client::SetActivationClient( |
57 root_window_.get(), | 58 root_window_.get(), |
58 new aura::DesktopActivationClient(root_window_.get())); | 59 new aura::DesktopActivationClient(root_window_.get())); |
59 aura::client::SetDispatcherClient(root_window_.get(), | 60 aura::client::SetDispatcherClient(root_window_.get(), |
60 new aura::DesktopDispatcherClient); | 61 new aura::DesktopDispatcherClient); |
61 } | 62 } |
62 | 63 |
63 void DesktopNativeWidgetHelperAura::PostInitialize() { | 64 void DesktopNativeWidgetHelperAura::PostInitialize() { |
64 #if defined(OS_WIN) | 65 #if defined(OS_WIN) |
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
121 widget_->SetBounds(gfx::Rect(root->GetHostSize())); | 122 widget_->SetBounds(gfx::Rect(root->GetHostSize())); |
122 } | 123 } |
123 | 124 |
124 void DesktopNativeWidgetHelperAura::OnRootWindowHostClosed( | 125 void DesktopNativeWidgetHelperAura::OnRootWindowHostClosed( |
125 const aura::RootWindow* root) { | 126 const aura::RootWindow* root) { |
126 DCHECK_EQ(root, root_window_.get()); | 127 DCHECK_EQ(root, root_window_.get()); |
127 widget_->GetWidget()->Close(); | 128 widget_->GetWidget()->Close(); |
128 } | 129 } |
129 | 130 |
130 } // namespace views | 131 } // namespace views |
OLD | NEW |