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

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

Issue 8432001: Tweaks whether Show activates the window or not. I'm pretty sure this (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge to trunk Created 9 years, 1 month 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 | 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 VIEWS_WIDGET_NATIVE_WIDGET_AURA_H_ 5 #ifndef VIEWS_WIDGET_NATIVE_WIDGET_AURA_H_
6 #define VIEWS_WIDGET_NATIVE_WIDGET_AURA_H_ 6 #define 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 134 matching lines...) Expand 10 before | Expand all | Expand 10 after
145 145
146 aura::Window* window_; 146 aura::Window* window_;
147 147
148 // See class documentation for Widget in widget.h for a note about ownership. 148 // See class documentation for Widget in widget.h for a note about ownership.
149 Widget::InitParams::Ownership ownership_; 149 Widget::InitParams::Ownership ownership_;
150 150
151 // The following factory is used for calls to close the NativeWidgetAura 151 // The following factory is used for calls to close the NativeWidgetAura
152 // instance. 152 // instance.
153 base::WeakPtrFactory<NativeWidgetAura> close_widget_factory_; 153 base::WeakPtrFactory<NativeWidgetAura> close_widget_factory_;
154 154
155 // Can we be made active?
155 bool can_activate_; 156 bool can_activate_;
156 157
157 gfx::NativeCursor cursor_; 158 gfx::NativeCursor cursor_;
158 159
159 scoped_ptr<TooltipManagerViews> tooltip_manager_; 160 scoped_ptr<TooltipManagerViews> tooltip_manager_;
160 161
161 DISALLOW_COPY_AND_ASSIGN(NativeWidgetAura); 162 DISALLOW_COPY_AND_ASSIGN(NativeWidgetAura);
162 }; 163 };
163 164
164 } // namespace views 165 } // namespace views
165 166
166 #endif // VIEWS_WIDGET_NATIVE_WIDGET_AURA_H_ 167 #endif // VIEWS_WIDGET_NATIVE_WIDGET_AURA_H_
OLDNEW
« no previous file with comments | « no previous file | views/widget/native_widget_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698