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

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

Issue 19882003: desktop aura: Fix multiple ibeams in the omnibox. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 5 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 | « no previous file | ui/views/widget/desktop_aura/desktop_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) 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 #ifndef UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_NATIVE_WIDGET_AURA_H_ 5 #ifndef UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_NATIVE_WIDGET_AURA_H_
6 #define UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_NATIVE_WIDGET_AURA_H_ 6 #define UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_NATIVE_WIDGET_AURA_H_
7 7
8 #include "base/memory/weak_ptr.h" 8 #include "base/memory/weak_ptr.h"
9 #include "ui/aura/client/activation_change_observer.h" 9 #include "ui/aura/client/activation_change_observer.h"
10 #include "ui/aura/client/activation_delegate.h" 10 #include "ui/aura/client/activation_delegate.h"
(...skipping 230 matching lines...) Expand 10 before | Expand all | Expand 10 after
241 scoped_ptr<TooltipManagerAura> tooltip_manager_; 241 scoped_ptr<TooltipManagerAura> tooltip_manager_;
242 242
243 scoped_ptr<views::corewm::VisibilityController> visibility_controller_; 243 scoped_ptr<views::corewm::VisibilityController> visibility_controller_;
244 244
245 scoped_ptr<views::corewm::WindowModalityController> 245 scoped_ptr<views::corewm::WindowModalityController>
246 window_modality_controller_; 246 window_modality_controller_;
247 247
248 // See comments in OnLostActive(). 248 // See comments in OnLostActive().
249 bool restore_focus_on_activate_; 249 bool restore_focus_on_activate_;
250 250
251 gfx::NativeCursor cursor_;
252
251 scoped_ptr<corewm::ShadowController> shadow_controller_; 253 scoped_ptr<corewm::ShadowController> shadow_controller_;
252 254
253 // Reorders child windows of |window_| associated with a view based on the 255 // Reorders child windows of |window_| associated with a view based on the
254 // order of the associated views in the widget's view hierarchy. 256 // order of the associated views in the widget's view hierarchy.
255 scoped_ptr<WindowReorderer> window_reorderer_; 257 scoped_ptr<WindowReorderer> window_reorderer_;
256 258
257 DISALLOW_COPY_AND_ASSIGN(DesktopNativeWidgetAura); 259 DISALLOW_COPY_AND_ASSIGN(DesktopNativeWidgetAura);
258 }; 260 };
259 261
260 } // namespace views 262 } // namespace views
261 263
262 #endif // UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_NATIVE_WIDGET_AURA_H_ 264 #endif // UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_NATIVE_WIDGET_AURA_H_
OLDNEW
« no previous file with comments | « no previous file | ui/views/widget/desktop_aura/desktop_native_widget_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698