OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 "views/widget/native_widget_aura.h" | 5 #include "views/widget/native_widget_aura.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "ui/aura/desktop.h" | 8 #include "ui/aura/desktop.h" |
9 #include "ui/aura/event.h" | 9 #include "ui/aura/event.h" |
10 #include "ui/aura/window.h" | 10 #include "ui/aura/window.h" |
(...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
150 gfx::Point* offset, | 150 gfx::Point* offset, |
151 ui::Layer** layer_parent) { | 151 ui::Layer** layer_parent) { |
152 if (layer_parent) | 152 if (layer_parent) |
153 *layer_parent = window_->layer(); | 153 *layer_parent = window_->layer(); |
154 } | 154 } |
155 | 155 |
156 void NativeWidgetAura::ReorderLayers() { | 156 void NativeWidgetAura::ReorderLayers() { |
157 } | 157 } |
158 | 158 |
159 void NativeWidgetAura::ViewRemoved(View* view) { | 159 void NativeWidgetAura::ViewRemoved(View* view) { |
160 // NOTIMPLEMENTED(); | 160 //NOTIMPLEMENTED(); |
161 } | 161 } |
162 | 162 |
163 void NativeWidgetAura::SetNativeWindowProperty(const char* name, void* value) { | 163 void NativeWidgetAura::SetNativeWindowProperty(const char* name, void* value) { |
164 if (window_) | 164 if (window_) |
165 window_->SetProperty(name, value); | 165 window_->SetProperty(name, value); |
166 } | 166 } |
167 | 167 |
168 void* NativeWidgetAura::GetNativeWindowProperty(const char* name) const { | 168 void* NativeWidgetAura::GetNativeWindowProperty(const char* name) const { |
169 return window_ ? window_->GetProperty(name) : NULL; | 169 return window_ ? window_->GetProperty(name) : NULL; |
170 } | 170 } |
171 | 171 |
172 TooltipManager* NativeWidgetAura::GetTooltipManager() const { | 172 TooltipManager* NativeWidgetAura::GetTooltipManager() const { |
173 //NOTIMPLEMENTED(); | 173 //NOTIMPLEMENTED(); |
174 return NULL; | 174 return NULL; |
175 } | 175 } |
176 | 176 |
177 bool NativeWidgetAura::IsScreenReaderActive() const { | 177 bool NativeWidgetAura::IsScreenReaderActive() const { |
178 NOTIMPLEMENTED(); | 178 //NOTIMPLEMENTED(); |
179 return false; | 179 return false; |
180 } | 180 } |
181 | 181 |
182 void NativeWidgetAura::SendNativeAccessibilityEvent( | 182 void NativeWidgetAura::SendNativeAccessibilityEvent( |
183 View* view, | 183 View* view, |
184 ui::AccessibilityTypes::Event event_type) { | 184 ui::AccessibilityTypes::Event event_type) { |
185 NOTIMPLEMENTED(); | 185 //NOTIMPLEMENTED(); |
186 } | 186 } |
187 | 187 |
188 void NativeWidgetAura::SetMouseCapture() { | 188 void NativeWidgetAura::SetMouseCapture() { |
189 window_->SetCapture(); | 189 window_->SetCapture(); |
190 } | 190 } |
191 | 191 |
192 void NativeWidgetAura::ReleaseMouseCapture() { | 192 void NativeWidgetAura::ReleaseMouseCapture() { |
193 window_->ReleaseCapture(); | 193 window_->ReleaseCapture(); |
194 } | 194 } |
195 | 195 |
(...skipping 19 matching lines...) Expand all Loading... |
215 size.height())); | 215 size.height())); |
216 } | 216 } |
217 | 217 |
218 void NativeWidgetAura::GetWindowPlacement( | 218 void NativeWidgetAura::GetWindowPlacement( |
219 gfx::Rect* bounds, | 219 gfx::Rect* bounds, |
220 ui::WindowShowState* maximized) const { | 220 ui::WindowShowState* maximized) const { |
221 *maximized = window_->show_state(); | 221 *maximized = window_->show_state(); |
222 } | 222 } |
223 | 223 |
224 void NativeWidgetAura::SetWindowTitle(const string16& title) { | 224 void NativeWidgetAura::SetWindowTitle(const string16& title) { |
225 NOTIMPLEMENTED(); | 225 // Aura doesn't have native window frames. |
226 } | 226 } |
227 | 227 |
228 void NativeWidgetAura::SetWindowIcons(const SkBitmap& window_icon, | 228 void NativeWidgetAura::SetWindowIcons(const SkBitmap& window_icon, |
229 const SkBitmap& app_icon) { | 229 const SkBitmap& app_icon) { |
230 NOTIMPLEMENTED(); | 230 // Aura doesn't have window icons. |
231 } | 231 } |
232 | 232 |
233 void NativeWidgetAura::SetAccessibleName(const string16& name) { | 233 void NativeWidgetAura::SetAccessibleName(const string16& name) { |
234 NOTIMPLEMENTED(); | 234 //NOTIMPLEMENTED(); |
235 } | 235 } |
236 | 236 |
237 void NativeWidgetAura::SetAccessibleRole(ui::AccessibilityTypes::Role role) { | 237 void NativeWidgetAura::SetAccessibleRole(ui::AccessibilityTypes::Role role) { |
238 NOTIMPLEMENTED(); | 238 //NOTIMPLEMENTED(); |
239 } | 239 } |
240 | 240 |
241 void NativeWidgetAura::SetAccessibleState(ui::AccessibilityTypes::State state) { | 241 void NativeWidgetAura::SetAccessibleState(ui::AccessibilityTypes::State state) { |
242 NOTIMPLEMENTED(); | 242 //NOTIMPLEMENTED(); |
243 } | 243 } |
244 | 244 |
245 void NativeWidgetAura::BecomeModal() { | 245 void NativeWidgetAura::BecomeModal() { |
246 NOTIMPLEMENTED(); | 246 NOTIMPLEMENTED(); |
247 } | 247 } |
248 | 248 |
249 gfx::Rect NativeWidgetAura::GetWindowScreenBounds() const { | 249 gfx::Rect NativeWidgetAura::GetWindowScreenBounds() const { |
250 return window_->GetScreenBounds(); | 250 return window_->GetScreenBounds(); |
251 } | 251 } |
252 | 252 |
253 gfx::Rect NativeWidgetAura::GetClientAreaScreenBounds() const { | 253 gfx::Rect NativeWidgetAura::GetClientAreaScreenBounds() const { |
254 // TODO(beng): | 254 // In Aura, the entire window is the client area. |
255 NOTIMPLEMENTED(); | |
256 return window_->GetScreenBounds(); | 255 return window_->GetScreenBounds(); |
257 } | 256 } |
258 | 257 |
259 gfx::Rect NativeWidgetAura::GetRestoredBounds() const { | 258 gfx::Rect NativeWidgetAura::GetRestoredBounds() const { |
260 // TODO(beng): | 259 return window_->restore_bounds(); |
261 NOTIMPLEMENTED(); | |
262 return window_->bounds(); | |
263 } | 260 } |
264 | 261 |
265 void NativeWidgetAura::SetBounds(const gfx::Rect& bounds) { | 262 void NativeWidgetAura::SetBounds(const gfx::Rect& bounds) { |
266 window_->SetBounds(bounds); | 263 window_->SetBounds(bounds); |
267 } | 264 } |
268 | 265 |
269 void NativeWidgetAura::SetSize(const gfx::Size& size) { | 266 void NativeWidgetAura::SetSize(const gfx::Size& size) { |
270 window_->SetBounds(gfx::Rect(window_->bounds().origin(), size)); | 267 window_->SetBounds(gfx::Rect(window_->bounds().origin(), size)); |
271 } | 268 } |
272 | 269 |
(...skipping 358 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
631 } | 628 } |
632 | 629 |
633 // static | 630 // static |
634 bool NativeWidgetPrivate::IsMouseButtonDown() { | 631 bool NativeWidgetPrivate::IsMouseButtonDown() { |
635 NOTIMPLEMENTED(); | 632 NOTIMPLEMENTED(); |
636 return false; | 633 return false; |
637 } | 634 } |
638 | 635 |
639 } // namespace internal | 636 } // namespace internal |
640 } // namespace views | 637 } // namespace views |
OLD | NEW |