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

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

Issue 15922004: Rename Widget::CalculateOffsetToAncestorWithLayer() to Widget::GetLayer() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 7 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/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 "ui/aura/client/activation_client.h" 8 #include "ui/aura/client/activation_client.h"
9 #include "ui/aura/client/aura_constants.h" 9 #include "ui/aura/client/aura_constants.h"
10 #include "ui/aura/client/stacking_client.h" 10 #include "ui/aura/client/stacking_client.h"
(...skipping 294 matching lines...) Expand 10 before | Expand all | Expand 10 after
305 } 305 }
306 306
307 const ui::Compositor* DesktopNativeWidgetAura::GetCompositor() const { 307 const ui::Compositor* DesktopNativeWidgetAura::GetCompositor() const {
308 return window_->layer()->GetCompositor(); 308 return window_->layer()->GetCompositor();
309 } 309 }
310 310
311 ui::Compositor* DesktopNativeWidgetAura::GetCompositor() { 311 ui::Compositor* DesktopNativeWidgetAura::GetCompositor() {
312 return window_->layer()->GetCompositor(); 312 return window_->layer()->GetCompositor();
313 } 313 }
314 314
315 gfx::Vector2d DesktopNativeWidgetAura::CalculateOffsetToAncestorWithLayer( 315 ui::Layer* DesktopNativeWidgetAura::GetLayer() {
316 ui::Layer** layer_parent) { 316 return window_->layer();
317 if (layer_parent)
318 *layer_parent = window_->layer();
319 return gfx::Vector2d();
320 } 317 }
321 318
322 void DesktopNativeWidgetAura::ViewRemoved(View* view) { 319 void DesktopNativeWidgetAura::ViewRemoved(View* view) {
323 } 320 }
324 321
325 void DesktopNativeWidgetAura::SetNativeWindowProperty(const char* name, 322 void DesktopNativeWidgetAura::SetNativeWindowProperty(const char* name,
326 void* value) { 323 void* value) {
327 window_->SetNativeWindowProperty(name, value); 324 window_->SetNativeWindowProperty(name, value);
328 } 325 }
329 326
(...skipping 509 matching lines...) Expand 10 before | Expand all | Expand 10 after
839 drop_helper_->OnDragExit(); 836 drop_helper_->OnDragExit();
840 } 837 }
841 838
842 int DesktopNativeWidgetAura::OnPerformDrop(const ui::DropTargetEvent& event) { 839 int DesktopNativeWidgetAura::OnPerformDrop(const ui::DropTargetEvent& event) {
843 DCHECK(drop_helper_.get() != NULL); 840 DCHECK(drop_helper_.get() != NULL);
844 return drop_helper_->OnDrop(event.data(), event.location(), 841 return drop_helper_->OnDrop(event.data(), event.location(),
845 last_drop_operation_); 842 last_drop_operation_);
846 } 843 }
847 844
848 } // namespace views 845 } // namespace views
OLDNEW
« no previous file with comments | « ui/views/widget/desktop_aura/desktop_native_widget_aura.h ('k') | ui/views/widget/native_widget_aura.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698