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

Side by Side Diff: ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc

Issue 1135693006: Fix X11DesktopHandler::ActivateWindow on Unity for known user gestures Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 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
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/views/widget/desktop_aura/desktop_window_tree_host_win.h" 5 #include "ui/views/widget/desktop_aura/desktop_window_tree_host_win.h"
6 6
7 #include "base/win/metro.h" 7 #include "base/win/metro.h"
8 #include "third_party/skia/include/core/SkPath.h" 8 #include "third_party/skia/include/core/SkPath.h"
9 #include "third_party/skia/include/core/SkRegion.h" 9 #include "third_party/skia/include/core/SkRegion.h"
10 #include "ui/aura/client/aura_constants.h" 10 #include "ui/aura/client/aura_constants.h"
(...skipping 300 matching lines...) Expand 10 before | Expand all | Expand 10 after
311 message_handler_->SetRegion(NULL); 311 message_handler_->SetRegion(NULL);
312 } 312 }
313 313
314 delete native_region; 314 delete native_region;
315 } 315 }
316 316
317 void DesktopWindowTreeHostWin::Activate() { 317 void DesktopWindowTreeHostWin::Activate() {
318 message_handler_->Activate(); 318 message_handler_->Activate();
319 } 319 }
320 320
321 void DesktopWindowTreeHostWin::ActivateForUserGesture() {
322 Activate();
323 }
324
321 void DesktopWindowTreeHostWin::Deactivate() { 325 void DesktopWindowTreeHostWin::Deactivate() {
322 message_handler_->Deactivate(); 326 message_handler_->Deactivate();
323 } 327 }
324 328
325 bool DesktopWindowTreeHostWin::IsActive() const { 329 bool DesktopWindowTreeHostWin::IsActive() const {
326 return message_handler_->IsActive(); 330 return message_handler_->IsActive();
327 } 331 }
328 332
329 void DesktopWindowTreeHostWin::Maximize() { 333 void DesktopWindowTreeHostWin::Maximize() {
330 message_handler_->Maximize(); 334 message_handler_->Maximize();
(...skipping 661 matching lines...) Expand 10 before | Expand all | Expand 10 after
992 996
993 // static 997 // static
994 DesktopWindowTreeHost* DesktopWindowTreeHost::Create( 998 DesktopWindowTreeHost* DesktopWindowTreeHost::Create(
995 internal::NativeWidgetDelegate* native_widget_delegate, 999 internal::NativeWidgetDelegate* native_widget_delegate,
996 DesktopNativeWidgetAura* desktop_native_widget_aura) { 1000 DesktopNativeWidgetAura* desktop_native_widget_aura) {
997 return new DesktopWindowTreeHostWin(native_widget_delegate, 1001 return new DesktopWindowTreeHostWin(native_widget_delegate,
998 desktop_native_widget_aura); 1002 desktop_native_widget_aura);
999 } 1003 }
1000 1004
1001 } // namespace views 1005 } // namespace views
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698