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

Unified Diff: views/desktop/desktop_window_root_view.cc

Issue 7740039: Don't activate POPUP window (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: sync Created 9 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 side-by-side diff with in-line comments
Download patch
Index: views/desktop/desktop_window_root_view.cc
diff --git a/views/desktop/desktop_window_root_view.cc b/views/desktop/desktop_window_root_view.cc
deleted file mode 100644
index 4f1d5ca0c74bb2431dc5db8bf2e1fd9f81f646d5..0000000000000000000000000000000000000000
--- a/views/desktop/desktop_window_root_view.cc
+++ /dev/null
@@ -1,56 +0,0 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "views/desktop/desktop_window_root_view.h"
-
-#include "views/desktop/desktop_window_view.h"
-#include "views/widget/native_widget_view.h"
-#include "views/widget/widget.h"
-
-namespace views {
-namespace desktop {
-
-////////////////////////////////////////////////////////////////////////////////
-// DesktopWindowRootView, public:
-
-DesktopWindowRootView::DesktopWindowRootView(
- DesktopWindowView* desktop_window_view,
- Widget* window)
- : internal::RootView(window),
- desktop_window_view_(desktop_window_view) {
-}
-
-DesktopWindowRootView::~DesktopWindowRootView() {
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// DesktopWindowRootView, internal::RootView overrides:
-
-bool DesktopWindowRootView::OnMousePressed(const MouseEvent& event) {
- ActivateWidgetAtLocation(event.location());
- return RootView::OnMousePressed(event);
-}
-
-ui::TouchStatus DesktopWindowRootView::OnTouchEvent(const TouchEvent& event) {
- ActivateWidgetAtLocation(event.location());
- return RootView::OnTouchEvent(event);
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// DesktopWindowRootView, private
-
-void DesktopWindowRootView::ActivateWidgetAtLocation(const gfx::Point& point) {
- View* target = GetEventHandlerForPoint(point);
- if (target->GetClassName() == internal::NativeWidgetView::kViewClassName) {
- internal::NativeWidgetView* native_widget_view =
- static_cast<internal::NativeWidgetView*>(target);
- desktop_window_view_->ActivateWidget(
- native_widget_view->GetAssociatedWidget());
- } else {
- desktop_window_view_->ActivateWidget(NULL);
- }
-}
-
-} // namespace desktop
-} // namespace views

Powered by Google App Engine
This is Rietveld 408576698