diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-18 21:42:35 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-18 21:42:35 +0000 |
| commit | 6c9ade0bd9ad6960342efbb01fb121eaf874dc3b (patch) | |
| tree | db429bf08416bf4701c09bd553ec672f4b28d4d5 /chrome/browser/dock_info_gtk.cc | |
| parent | 3a73f53f744be8b31f1d0c1080d92b46d3159eac (diff) | |
| download | chromium_src-6c9ade0bd9ad6960342efbb01fb121eaf874dc3b.zip chromium_src-6c9ade0bd9ad6960342efbb01fb121eaf874dc3b.tar.gz chromium_src-6c9ade0bd9ad6960342efbb01fb121eaf874dc3b.tar.bz2 | |
Makes it so you can't detach tabs on Chrome OS. It doesn't make sense
given the current design and triggers a crash. I'm also effectively
disabling DockInfo for ChromeOS as that triggers a crash. I don't
believe we'll hit the code after my first change, but I'm going for
completeness.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/399083
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@32408 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/dock_info_gtk.cc')
| -rw-r--r-- | chrome/browser/dock_info_gtk.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/dock_info_gtk.cc b/chrome/browser/dock_info_gtk.cc index 64a86ef..6923e25 100644 --- a/chrome/browser/dock_info_gtk.cc +++ b/chrome/browser/dock_info_gtk.cc @@ -193,12 +193,12 @@ GtkWindow* DockInfo::GetLocalProcessWindowAtPoint( if (factory_) return factory_->GetLocalProcessWindowAtPoint(screen_point, ignore); -#if !defined(TOOLKIT_VIEWS) +#if defined(OS_CHROMEOS) || defined(TOOLKIT_VIEWS) + return NULL; +#else XID xid = LocalProcessWindowFinder::GetProcessWindowAtPoint(screen_point, ignore); return BrowserWindowGtk::GetBrowserWindowForXID(xid); -#else - return NULL; #endif } |