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

Side by Side Diff: ui/views/widget/widget.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/widget.h" 5 #include "ui/views/widget/widget.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/message_loop/message_loop.h" 8 #include "base/message_loop/message_loop.h"
9 #include "base/strings/utf_string_conversions.h" 9 #include "base/strings/utf_string_conversions.h"
10 #include "base/trace_event/trace_event.h" 10 #include "base/trace_event/trace_event.h"
(...skipping 633 matching lines...) Expand 10 before | Expand all | Expand 10 after
644 SetBounds(initial_restored_bounds_); 644 SetBounds(initial_restored_bounds_);
645 saved_show_state_ = ui::SHOW_STATE_NORMAL; 645 saved_show_state_ = ui::SHOW_STATE_NORMAL;
646 } 646 }
647 native_widget_->ShowWithWindowState(ui::SHOW_STATE_INACTIVE); 647 native_widget_->ShowWithWindowState(ui::SHOW_STATE_INACTIVE);
648 } 648 }
649 649
650 void Widget::Activate() { 650 void Widget::Activate() {
651 native_widget_->Activate(); 651 native_widget_->Activate();
652 } 652 }
653 653
654 void Widget::ActivateForUserGesture() {
655 native_widget_->ActivateForUserGesture();
656 }
657
654 void Widget::Deactivate() { 658 void Widget::Deactivate() {
655 native_widget_->Deactivate(); 659 native_widget_->Deactivate();
656 } 660 }
657 661
658 bool Widget::IsActive() const { 662 bool Widget::IsActive() const {
659 return native_widget_->IsActive(); 663 return native_widget_->IsActive();
660 } 664 }
661 665
662 void Widget::DisableInactiveRendering() { 666 void Widget::DisableInactiveRendering() {
663 SetInactiveRenderingDisabled(true); 667 SetInactiveRenderingDisabled(true);
(...skipping 866 matching lines...) Expand 10 before | Expand all | Expand 10 after
1530 1534
1531 //////////////////////////////////////////////////////////////////////////////// 1535 ////////////////////////////////////////////////////////////////////////////////
1532 // internal::NativeWidgetPrivate, NativeWidget implementation: 1536 // internal::NativeWidgetPrivate, NativeWidget implementation:
1533 1537
1534 internal::NativeWidgetPrivate* NativeWidgetPrivate::AsNativeWidgetPrivate() { 1538 internal::NativeWidgetPrivate* NativeWidgetPrivate::AsNativeWidgetPrivate() {
1535 return this; 1539 return this;
1536 } 1540 }
1537 1541
1538 } // namespace internal 1542 } // namespace internal
1539 } // namespace views 1543 } // namespace views
OLDNEW
« content/public/browser/web_contents_delegate.h ('K') | « ui/views/widget/widget.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698