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

Side by Side Diff: ui/aura/root_window.cc

Issue 11189148: desktop linux aura: Fix event/capture focus after dragging a window. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix windows compile. Created 8 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 | « ui/aura/root_window.h ('k') | ui/aura/root_window_host_delegate.h » ('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 #include "ui/aura/root_window.h" 5 #include "ui/aura/root_window.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/auto_reset.h" 9 #include "base/auto_reset.h"
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 906 matching lines...) Expand 10 before | Expand all | Expand 10 after
917 } 917 }
918 918
919 // Get the list of GestureEvents from GestureRecognizer. 919 // Get the list of GestureEvents from GestureRecognizer.
920 scoped_ptr<ui::GestureRecognizer::Gestures> gestures; 920 scoped_ptr<ui::GestureRecognizer::Gestures> gestures;
921 gestures.reset(gesture_recognizer_->ProcessTouchEventForGesture( 921 gestures.reset(gesture_recognizer_->ProcessTouchEventForGesture(
922 *event, result, target)); 922 *event, result, target));
923 923
924 return ProcessGestures(gestures.get()) ? true : handled; 924 return ProcessGestures(gestures.get()) ? true : handled;
925 } 925 }
926 926
927 void RootWindow::OnHostLostCapture() { 927 void RootWindow::OnHostLostWindowCapture() {
928 Window* capture_window = client::GetCaptureWindow(this); 928 Window* capture_window = client::GetCaptureWindow(this);
929 if (capture_window && capture_window->GetRootWindow() == this) 929 if (capture_window && capture_window->GetRootWindow() == this)
930 capture_window->ReleaseCapture(); 930 capture_window->ReleaseCapture();
931 } 931 }
932 932
933 void RootWindow::OnHostLostMouseGrab() {
934 mouse_pressed_handler_ = NULL;
935 mouse_moved_handler_ = NULL;
936 mouse_event_dispatch_target_ = NULL;
937 }
938
933 void RootWindow::OnHostPaint() { 939 void RootWindow::OnHostPaint() {
934 Draw(); 940 Draw();
935 } 941 }
936 942
937 void RootWindow::OnHostMoved(const gfx::Point& origin) { 943 void RootWindow::OnHostMoved(const gfx::Point& origin) {
938 FOR_EACH_OBSERVER(RootWindowObserver, observers_, 944 FOR_EACH_OBSERVER(RootWindowObserver, observers_,
939 OnRootWindowMoved(this, origin)); 945 OnRootWindowMoved(this, origin));
940 } 946 }
941 947
942 void RootWindow::OnHostResized(const gfx::Size& size) { 948 void RootWindow::OnHostResized(const gfx::Size& size) {
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
1065 void RootWindow::UnlockCompositor() { 1071 void RootWindow::UnlockCompositor() {
1066 DCHECK(compositor_lock_); 1072 DCHECK(compositor_lock_);
1067 compositor_lock_ = NULL; 1073 compositor_lock_ = NULL;
1068 if (draw_on_compositor_unlock_) { 1074 if (draw_on_compositor_unlock_) {
1069 draw_on_compositor_unlock_ = false; 1075 draw_on_compositor_unlock_ = false;
1070 ScheduleDraw(); 1076 ScheduleDraw();
1071 } 1077 }
1072 } 1078 }
1073 1079
1074 } // namespace aura 1080 } // namespace aura
OLDNEW
« no previous file with comments | « ui/aura/root_window.h ('k') | ui/aura/root_window_host_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698