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

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

Issue 2517663002: Fix unable to delete extensions continuously through keyboard (Closed)
Patch Set: nit Created 4 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
« 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 <string> 8 #include <string>
9 9
10 #include "base/macros.h" 10 #include "base/macros.h"
(...skipping 268 matching lines...) Expand 10 before | Expand all | Expand 10 after
279 std::unique_ptr<DropHelper> drop_helper_; 279 std::unique_ptr<DropHelper> drop_helper_;
280 int last_drop_operation_; 280 int last_drop_operation_;
281 281
282 std::unique_ptr<corewm::TooltipController> tooltip_controller_; 282 std::unique_ptr<corewm::TooltipController> tooltip_controller_;
283 std::unique_ptr<TooltipManagerAura> tooltip_manager_; 283 std::unique_ptr<TooltipManagerAura> tooltip_manager_;
284 284
285 std::unique_ptr<wm::VisibilityController> visibility_controller_; 285 std::unique_ptr<wm::VisibilityController> visibility_controller_;
286 286
287 std::unique_ptr<wm::WindowModalityController> window_modality_controller_; 287 std::unique_ptr<wm::WindowModalityController> window_modality_controller_;
288 288
289 bool restore_focus_on_activate_;
290
289 gfx::NativeCursor cursor_; 291 gfx::NativeCursor cursor_;
290 // We must manually reference count the number of users of |cursor_manager_| 292 // We must manually reference count the number of users of |cursor_manager_|
291 // because the cursors created by |cursor_manager_| are shared among the 293 // because the cursors created by |cursor_manager_| are shared among the
292 // DNWAs. We can't just stuff this in a LazyInstance because we need to 294 // DNWAs. We can't just stuff this in a LazyInstance because we need to
293 // destroy this as the last DNWA happens; we can't put it off until 295 // destroy this as the last DNWA happens; we can't put it off until
294 // (potentially) after we tear down the X11 connection because that's a 296 // (potentially) after we tear down the X11 connection because that's a
295 // crash. 297 // crash.
296 static int cursor_reference_count_; 298 static int cursor_reference_count_;
297 static wm::CursorManager* cursor_manager_; 299 static wm::CursorManager* cursor_manager_;
298 static DesktopNativeCursorManager* native_cursor_manager_; 300 static DesktopNativeCursorManager* native_cursor_manager_;
(...skipping 10 matching lines...) Expand all
309 // The following factory is used for calls to close the NativeWidgetAura 311 // The following factory is used for calls to close the NativeWidgetAura
310 // instance. 312 // instance.
311 base::WeakPtrFactory<DesktopNativeWidgetAura> close_widget_factory_; 313 base::WeakPtrFactory<DesktopNativeWidgetAura> close_widget_factory_;
312 314
313 DISALLOW_COPY_AND_ASSIGN(DesktopNativeWidgetAura); 315 DISALLOW_COPY_AND_ASSIGN(DesktopNativeWidgetAura);
314 }; 316 };
315 317
316 } // namespace views 318 } // namespace views
317 319
318 #endif // UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_NATIVE_WIDGET_AURA_H_ 320 #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