summaryrefslogtreecommitdiffstats
path: root/views/widget/native_widget_views.h
diff options
context:
space:
mode:
authoroshima@google.com <oshima@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-26 20:11:00 +0000
committeroshima@google.com <oshima@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-26 20:11:00 +0000
commitde09c7d0478d7a82785aa5080a9499ee8b36b1d8 (patch)
treee4260639c8cb89b71b49c075caf47e26fee09195 /views/widget/native_widget_views.h
parentf283925f7c607667e68f033c308964cb876a47d1 (diff)
downloadchromium_src-de09c7d0478d7a82785aa5080a9499ee8b36b1d8.zip
chromium_src-de09c7d0478d7a82785aa5080a9499ee8b36b1d8.tar.gz
chromium_src-de09c7d0478d7a82785aa5080a9499ee8b36b1d8.tar.bz2
Don't activate POPUP window
Clicking keyboard (and any popup like menu) was activating the widget, which hides VirtualKeyboard as it was stealing focus from browser window. This also moves the code that handles window activation to WindowManaer. Removed desktop_window_root_view.cc|h as it's no longer necesssary. BUG=none TEST=VirtualKeyboard on views desktop should work. Review URL: http://codereview.chromium.org/7740039 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@98472 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/widget/native_widget_views.h')
-rw-r--r--views/widget/native_widget_views.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/views/widget/native_widget_views.h b/views/widget/native_widget_views.h
index 440600c..2095d12 100644
--- a/views/widget/native_widget_views.h
+++ b/views/widget/native_widget_views.h
@@ -11,6 +11,7 @@
#include "base/message_loop.h"
#include "ui/gfx/transform.h"
#include "views/widget/native_widget_private.h"
+#include "views/widget/widget.h"
namespace views {
namespace desktop {
@@ -43,7 +44,7 @@ class VIEWS_EXPORT NativeWidgetViews : public internal::NativeWidgetPrivate {
delete_native_view_ = delete_native_view;
}
- internal::NativeWidgetDelegate* delegate() { return delegate_; }
+ internal::NativeWidgetDelegate* delegate() const { return delegate_; }
protected:
friend class NativeWidgetView;