diff options
| author | xiyuan@chromium.org <xiyuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-12 22:19:13 +0000 |
|---|---|---|
| committer | xiyuan@chromium.org <xiyuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-12 22:19:13 +0000 |
| commit | c9c16ab3dc14d9caf03665e359b713e8c21486ba (patch) | |
| tree | 4f20635159b0f25511cde1a7dd6b3ed249d672b7 | |
| parent | 31aa30be24edc4b269463762370b2ed2eeedeb25 (diff) | |
| download | chromium_src-c9c16ab3dc14d9caf03665e359b713e8c21486ba.zip chromium_src-c9c16ab3dc14d9caf03665e359b713e8c21486ba.tar.gz chromium_src-c9c16ab3dc14d9caf03665e359b713e8c21486ba.tar.bz2 | |
[ChromeOS] WebUILoginView returns true for IsPopupOrPanel.
This makes WebUILoginView not a drag-n-drop target as TabContents::ShouldAcceptDragAndDrop would return false now. Besides, WebUILoginView is popup in some sense.
BUG=chromium-os:18781
TEST=Verify crash no longer happens for chromium-os:18781.
Review URL: http://codereview.chromium.org/7640023
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@96636 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/chromeos/login/webui_login_view.cc | 4 | ||||
| -rw-r--r-- | chrome/browser/chromeos/login/webui_login_view.h | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/chrome/browser/chromeos/login/webui_login_view.cc b/chrome/browser/chromeos/login/webui_login_view.cc index 47f573a..86174ea 100644 --- a/chrome/browser/chromeos/login/webui_login_view.cc +++ b/chrome/browser/chromeos/login/webui_login_view.cc @@ -248,6 +248,10 @@ bool WebUILoginView::HandleContextMenu(const ContextMenuParams& params) { #endif } +bool WebUILoginView::IsPopupOrPanel(const TabContents* source) const { + return true; +} + bool WebUILoginView::TakeFocus(bool reverse) { // Forward the focus back to web contents. webui_login_->tab_contents()->FocusThroughTabTraversal(reverse); diff --git a/chrome/browser/chromeos/login/webui_login_view.h b/chrome/browser/chromeos/login/webui_login_view.h index 2c5b13b..72b7b64 100644 --- a/chrome/browser/chromeos/login/webui_login_view.h +++ b/chrome/browser/chromeos/login/webui_login_view.h @@ -110,8 +110,10 @@ class WebUILoginView : public views::View, // Overridden from TabContentsDelegate. virtual bool HandleContextMenu(const ContextMenuParams& params) OVERRIDE; + virtual void HandleKeyboardEvent( + const NativeWebKeyboardEvent& event) OVERRIDE; + virtual bool IsPopupOrPanel(const TabContents* source) const OVERRIDE; virtual bool TakeFocus(bool reverse) OVERRIDE; - virtual void HandleKeyboardEvent(const NativeWebKeyboardEvent& event); // Window that contains status area. // TODO(nkostylev): Temporary solution till we have |