diff options
| author | zork@chromium.org <zork@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-18 19:23:25 +0000 |
|---|---|---|
| committer | zork@chromium.org <zork@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-18 19:23:25 +0000 |
| commit | 918c632d257d5c87f82265991d7b3ae84b8c391f (patch) | |
| tree | eb5752a10bf1fb6bbd42a80a6acec092fd50799c /chrome/browser/tab_contents | |
| parent | daa4b0db3fdaf5493490b7a249f6d0b809a1b1ac (diff) | |
| download | chromium_src-918c632d257d5c87f82265991d7b3ae84b8c391f.zip chromium_src-918c632d257d5c87f82265991d7b3ae84b8c391f.tar.gz chromium_src-918c632d257d5c87f82265991d7b3ae84b8c391f.tar.bz2 | |
Add support for ShowHtmlDialog() to Linux. This is modeled off the MacOS and Windows versions, except that it uses a gtk dialog and TabContentsContainerGtk to create the window.
BUG=25260
TEST=Call ShowHTMLDialog() with a working dialog, such as the login dialog for Bookmark sync.
Review URL: http://codereview.chromium.org/394011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@32363 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/tab_contents')
| -rw-r--r-- | chrome/browser/tab_contents/tab_contents_view_gtk.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/chrome/browser/tab_contents/tab_contents_view_gtk.cc b/chrome/browser/tab_contents/tab_contents_view_gtk.cc index 61c685e..3916640 100644 --- a/chrome/browser/tab_contents/tab_contents_view_gtk.cc +++ b/chrome/browser/tab_contents/tab_contents_view_gtk.cc @@ -345,8 +345,11 @@ bool TabContentsViewGtk::HandleKeyboardEvent( BrowserWindowGtk* browser_window = BrowserWindowGtk::GetBrowserWindowForNativeWindow(window); - DCHECK(browser_window); - return browser_window->HandleKeyboardEvent(event.os_event); + + // If this is a dialog, the top level window isn't a browser. In this case, + // we just return false. + return browser_window ? + browser_window->HandleKeyboardEvent(event.os_event) : false; } void TabContentsViewGtk::Observe(NotificationType type, |