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

Side by Side Diff: ash/drag_drop/drag_drop_controller.cc

Issue 23444051: Move the content-dependent RecreateLayer logic from aura::Window to RWHVA (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Better comments Created 7 years, 3 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
« no previous file with comments | « ash/display/mirror_window_controller.cc ('k') | ash/root_window_controller.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "ash/drag_drop/drag_drop_controller.h" 5 #include "ash/drag_drop/drag_drop_controller.h"
6 6
7 #include "ash/drag_drop/drag_drop_tracker.h" 7 #include "ash/drag_drop/drag_drop_tracker.h"
8 #include "ash/drag_drop/drag_image_view.h" 8 #include "ash/drag_drop/drag_image_view.h"
9 #include "ash/shell.h" 9 #include "ash/shell.h"
10 #include "ash/wm/coordinate_conversion.h" 10 #include "ash/wm/coordinate_conversion.h"
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
118 virtual void OnDeviceScaleFactorChanged(float device_scale_factor) OVERRIDE {} 118 virtual void OnDeviceScaleFactorChanged(float device_scale_factor) OVERRIDE {}
119 virtual void OnWindowDestroying() OVERRIDE {} 119 virtual void OnWindowDestroying() OVERRIDE {}
120 virtual void OnWindowDestroyed() OVERRIDE {} 120 virtual void OnWindowDestroyed() OVERRIDE {}
121 virtual void OnWindowTargetVisibilityChanged(bool visible) OVERRIDE {} 121 virtual void OnWindowTargetVisibilityChanged(bool visible) OVERRIDE {}
122 virtual bool HasHitTestMask() const OVERRIDE { 122 virtual bool HasHitTestMask() const OVERRIDE {
123 return true; 123 return true;
124 } 124 }
125 virtual void GetHitTestMask(gfx::Path* mask) const OVERRIDE { 125 virtual void GetHitTestMask(gfx::Path* mask) const OVERRIDE {
126 DCHECK(mask->isEmpty()); 126 DCHECK(mask->isEmpty());
127 } 127 }
128 virtual scoped_refptr<ui::Texture> CopyTexture() OVERRIDE { 128 virtual void DidRecreateLayer(ui::Layer* old_layer,
129 return scoped_refptr<ui::Texture>(); 129 ui::Layer* new_layer) OVERRIDE {}
130 }
131 130
132 private: 131 private:
133 DragDropController* drag_drop_controller_; 132 DragDropController* drag_drop_controller_;
134 133
135 DISALLOW_COPY_AND_ASSIGN(DragDropTrackerDelegate); 134 DISALLOW_COPY_AND_ASSIGN(DragDropTrackerDelegate);
136 }; 135 };
137 136
138 //////////////////////////////////////////////////////////////////////////////// 137 ////////////////////////////////////////////////////////////////////////////////
139 // DragDropController, public: 138 // DragDropController, public:
140 139
(...skipping 417 matching lines...) Expand 10 before | Expand all | Expand 10 after
558 drag_window_->RemoveObserver(this); 557 drag_window_->RemoveObserver(this);
559 drag_window_ = NULL; 558 drag_window_ = NULL;
560 drag_data_ = NULL; 559 drag_data_ = NULL;
561 // Cleanup can be called again while deleting DragDropTracker, so use Pass 560 // Cleanup can be called again while deleting DragDropTracker, so use Pass
562 // instead of reset to avoid double free. 561 // instead of reset to avoid double free.
563 drag_drop_tracker_.Pass(); 562 drag_drop_tracker_.Pass();
564 } 563 }
565 564
566 } // namespace internal 565 } // namespace internal
567 } // namespace ash 566 } // namespace ash
OLDNEW
« no previous file with comments | « ash/display/mirror_window_controller.cc ('k') | ash/root_window_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698