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

Side by Side Diff: ui/views/view.h

Issue 22934007: linux_aura: Fix crash on drags from the omnibox. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add DCHECK Created 7 years, 4 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/view.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_VIEW_H_ 5 #ifndef UI_VIEWS_VIEW_H_
6 #define UI_VIEWS_VIEW_H_ 6 #define UI_VIEWS_VIEW_H_
7 7
8 #include <algorithm> 8 #include <algorithm>
9 #include <map> 9 #include <map>
10 #include <set> 10 #include <set>
(...skipping 1522 matching lines...) Expand 10 before | Expand all | Expand 10 after
1533 1533
1534 // Context menus ------------------------------------------------------------- 1534 // Context menus -------------------------------------------------------------
1535 1535
1536 // The menu controller. 1536 // The menu controller.
1537 ContextMenuController* context_menu_controller_; 1537 ContextMenuController* context_menu_controller_;
1538 1538
1539 // Drag and drop ------------------------------------------------------------- 1539 // Drag and drop -------------------------------------------------------------
1540 1540
1541 DragController* drag_controller_; 1541 DragController* drag_controller_;
1542 1542
1543 // True while we're performing DoDrag(). On X11, we can have multiple mouse
1544 // move events in our event queue when we start a drag, so we need a way to
1545 // ignore events after the first one.
1546 bool currently_dragging_;
1547
1543 // Input -------------------------------------------------------------------- 1548 // Input --------------------------------------------------------------------
1544 1549
1545 scoped_ptr<internal::PostEventDispatchHandler> post_dispatch_handler_; 1550 scoped_ptr<internal::PostEventDispatchHandler> post_dispatch_handler_;
1546 1551
1547 // Accessibility ------------------------------------------------------------- 1552 // Accessibility -------------------------------------------------------------
1548 1553
1549 // Belongs to this view, but it's reference-counted on some platforms 1554 // Belongs to this view, but it's reference-counted on some platforms
1550 // so we can't use a scoped_ptr. It's dereferenced in the destructor. 1555 // so we can't use a scoped_ptr. It's dereferenced in the destructor.
1551 NativeViewAccessibility* native_view_accessibility_; 1556 NativeViewAccessibility* native_view_accessibility_;
1552 1557
1553 DISALLOW_COPY_AND_ASSIGN(View); 1558 DISALLOW_COPY_AND_ASSIGN(View);
1554 }; 1559 };
1555 1560
1556 } // namespace views 1561 } // namespace views
1557 1562
1558 #endif // UI_VIEWS_VIEW_H_ 1563 #endif // UI_VIEWS_VIEW_H_
OLDNEW
« no previous file with comments | « no previous file | ui/views/view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698