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

Side by Side Diff: ui/views/widget/native_widget_aura.h

Issue 8771015: Rename Desktop->RootWindow. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years 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 | « ui/views/view_unittest.cc ('k') | ui/views/widget/native_widget_aura.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) 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 #ifndef UI_VIEWS_WIDGET_NATIVE_WIDGET_AURA_H_ 5 #ifndef UI_VIEWS_WIDGET_NATIVE_WIDGET_AURA_H_
6 #define UI_VIEWS_WIDGET_NATIVE_WIDGET_AURA_H_ 6 #define UI_VIEWS_WIDGET_NATIVE_WIDGET_AURA_H_
7 #pragma once 7 #pragma once
8 8
9 #include "base/memory/scoped_vector.h" 9 #include "base/memory/scoped_vector.h"
10 #include "base/memory/weak_ptr.h" 10 #include "base/memory/weak_ptr.h"
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after
144 // Overridden from aura::WindowDragDropDelegate: 144 // Overridden from aura::WindowDragDropDelegate:
145 virtual void OnDragEntered(const aura::DropTargetEvent& event) OVERRIDE; 145 virtual void OnDragEntered(const aura::DropTargetEvent& event) OVERRIDE;
146 virtual int OnDragUpdated(const aura::DropTargetEvent& event) OVERRIDE; 146 virtual int OnDragUpdated(const aura::DropTargetEvent& event) OVERRIDE;
147 virtual void OnDragExited() OVERRIDE; 147 virtual void OnDragExited() OVERRIDE;
148 virtual int OnPerformDrop(const aura::DropTargetEvent& event) OVERRIDE; 148 virtual int OnPerformDrop(const aura::DropTargetEvent& event) OVERRIDE;
149 149
150 protected: 150 protected:
151 internal::NativeWidgetDelegate* delegate() { return delegate_; } 151 internal::NativeWidgetDelegate* delegate() { return delegate_; }
152 152
153 private: 153 private:
154 class DesktopObserverImpl; 154 class RootWindowObserverImpl;
155 155
156 internal::NativeWidgetDelegate* delegate_; 156 internal::NativeWidgetDelegate* delegate_;
157 157
158 aura::Window* window_; 158 aura::Window* window_;
159 159
160 // See class documentation for Widget in widget.h for a note about ownership. 160 // See class documentation for Widget in widget.h for a note about ownership.
161 Widget::InitParams::Ownership ownership_; 161 Widget::InitParams::Ownership ownership_;
162 162
163 // The following factory is used for calls to close the NativeWidgetAura 163 // The following factory is used for calls to close the NativeWidgetAura
164 // instance. 164 // instance.
165 base::WeakPtrFactory<NativeWidgetAura> close_widget_factory_; 165 base::WeakPtrFactory<NativeWidgetAura> close_widget_factory_;
166 166
167 // Can we be made active? 167 // Can we be made active?
168 bool can_activate_; 168 bool can_activate_;
169 169
170 gfx::NativeCursor cursor_; 170 gfx::NativeCursor cursor_;
171 171
172 scoped_ptr<TooltipManagerAura> tooltip_manager_; 172 scoped_ptr<TooltipManagerAura> tooltip_manager_;
173 173
174 scoped_ptr<DesktopObserverImpl> desktop_observer_; 174 scoped_ptr<RootWindowObserverImpl> root_window_observer_;
175 175
176 scoped_ptr<DropHelper> drop_helper_; 176 scoped_ptr<DropHelper> drop_helper_;
177 177
178 DISALLOW_COPY_AND_ASSIGN(NativeWidgetAura); 178 DISALLOW_COPY_AND_ASSIGN(NativeWidgetAura);
179 }; 179 };
180 180
181 } // namespace views 181 } // namespace views
182 182
183 #endif // UI_VIEWS_WIDGET_NATIVE_WIDGET_AURA_H_ 183 #endif // UI_VIEWS_WIDGET_NATIVE_WIDGET_AURA_H_
OLDNEW
« no previous file with comments | « ui/views/view_unittest.cc ('k') | ui/views/widget/native_widget_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698