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_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/debug/trace_event.h" | 8 #include "base/debug/trace_event.h" |
9 #include "ui/aura/client/activation_client.h" | 9 #include "ui/aura/client/activation_client.h" |
10 #include "ui/aura/client/aura_constants.h" | 10 #include "ui/aura/client/aura_constants.h" |
(...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
154 virtual ~DesktopNativeWidgetAuraWindowTreeClient() { | 154 virtual ~DesktopNativeWidgetAuraWindowTreeClient() { |
155 aura::client::SetWindowTreeClient(root_window_, NULL); | 155 aura::client::SetWindowTreeClient(root_window_, NULL); |
156 } | 156 } |
157 | 157 |
158 // Overridden from client::WindowTreeClient: | 158 // Overridden from client::WindowTreeClient: |
159 virtual aura::Window* GetDefaultParent(aura::Window* context, | 159 virtual aura::Window* GetDefaultParent(aura::Window* context, |
160 aura::Window* window, | 160 aura::Window* window, |
161 const gfx::Rect& bounds) OVERRIDE { | 161 const gfx::Rect& bounds) OVERRIDE { |
162 bool is_fullscreen = window->GetProperty(aura::client::kShowStateKey) == | 162 bool is_fullscreen = window->GetProperty(aura::client::kShowStateKey) == |
163 ui::SHOW_STATE_FULLSCREEN; | 163 ui::SHOW_STATE_FULLSCREEN; |
164 bool is_menu = window->type() == aura::client::WINDOW_TYPE_MENU; | 164 bool is_menu = window->type() == ui::wm::WINDOW_TYPE_MENU; |
165 if (is_fullscreen || is_menu) { | 165 if (is_fullscreen || is_menu) { |
166 return DesktopNativeWidgetTopLevelHandler::CreateParentWindow( | 166 return DesktopNativeWidgetTopLevelHandler::CreateParentWindow( |
167 window, bounds, is_fullscreen); | 167 window, bounds, is_fullscreen); |
168 } | 168 } |
169 return root_window_; | 169 return root_window_; |
170 } | 170 } |
171 | 171 |
172 private: | 172 private: |
173 aura::Window* root_window_; | 173 aura::Window* root_window_; |
174 | 174 |
(...skipping 941 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1116 input_method_event_filter_->SetInputMethodPropertyInRootWindow( | 1116 input_method_event_filter_->SetInputMethodPropertyInRootWindow( |
1117 root_window_->window()); | 1117 root_window_->window()); |
1118 root_window_event_filter_->AddHandler(input_method_event_filter_.get()); | 1118 root_window_event_filter_->AddHandler(input_method_event_filter_.get()); |
1119 } | 1119 } |
1120 | 1120 |
1121 void DesktopNativeWidgetAura::UpdateWindowTransparency() { | 1121 void DesktopNativeWidgetAura::UpdateWindowTransparency() { |
1122 content_window_->SetTransparent(ShouldUseNativeFrame()); | 1122 content_window_->SetTransparent(ShouldUseNativeFrame()); |
1123 } | 1123 } |
1124 | 1124 |
1125 } // namespace views | 1125 } // namespace views |
OLD | NEW |