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

Side by Side Diff: views/widget/root_view.cc

Issue 5696005: Fix GestureManager Singleton implementation (Closed) Base URL: http://git.chromium.org/git/chromium.git
Patch Set: Created 10 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 | « views/touchui/gesture_manager.cc ('k') | no next file » | 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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 #include "views/widget/root_view.h" 5 #include "views/widget/root_view.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "app/drag_drop_types.h" 9 #include "app/drag_drop_types.h"
10 #include "app/keyboard_codes.h" 10 #include "app/keyboard_codes.h"
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 previous_cursor_(NULL), 75 previous_cursor_(NULL),
76 #endif 76 #endif
77 default_keyboard_handler_(NULL), 77 default_keyboard_handler_(NULL),
78 focus_on_mouse_pressed_(false), 78 focus_on_mouse_pressed_(false),
79 ignore_set_focus_calls_(false), 79 ignore_set_focus_calls_(false),
80 focus_traversable_parent_(NULL), 80 focus_traversable_parent_(NULL),
81 focus_traversable_parent_view_(NULL), 81 focus_traversable_parent_view_(NULL),
82 drag_view_(NULL) 82 drag_view_(NULL)
83 #if defined(TOUCH_UI) 83 #if defined(TOUCH_UI)
84 , 84 ,
85 gesture_manager_(GestureManager::Get()), 85 gesture_manager_(GestureManager::GetInstance()),
86 touch_pressed_handler_(NULL) 86 touch_pressed_handler_(NULL)
87 #endif 87 #endif
88 #ifndef NDEBUG 88 #ifndef NDEBUG
89 , 89 ,
90 is_processing_paint_(false) 90 is_processing_paint_(false)
91 #endif 91 #endif
92 { 92 {
93 } 93 }
94 94
95 RootView::~RootView() { 95 RootView::~RootView() {
(...skipping 686 matching lines...) Expand 10 before | Expand all | Expand 10 after
782 #elif defined(OS_LINUX) 782 #elif defined(OS_LINUX)
783 gfx::NativeView native_view = 783 gfx::NativeView native_view =
784 static_cast<WidgetGtk*>(GetWidget())->window_contents(); 784 static_cast<WidgetGtk*>(GetWidget())->window_contents();
785 if (!native_view) 785 if (!native_view)
786 return; 786 return;
787 gdk_window_set_cursor(native_view->window, cursor); 787 gdk_window_set_cursor(native_view->window, cursor);
788 #endif 788 #endif
789 } 789 }
790 790
791 } // namespace views 791 } // namespace views
OLDNEW
« no previous file with comments | « views/touchui/gesture_manager.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698