diff options
| author | jhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-06 00:21:36 +0000 |
|---|---|---|
| committer | jhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-06 00:21:36 +0000 |
| commit | 5665769ecaa9305433d8582aa26fb44f0ab0146f (patch) | |
| tree | 49698e545050ef2d4918b345e61844cf89809d90 /chrome/browser | |
| parent | 8618fa7fa6a2f11c6e89a8fb00864306874b33fc (diff) | |
| download | chromium_src-5665769ecaa9305433d8582aa26fb44f0ab0146f.zip chromium_src-5665769ecaa9305433d8582aa26fb44f0ab0146f.tar.gz chromium_src-5665769ecaa9305433d8582aa26fb44f0ab0146f.tar.bz2 | |
Add dock_info.cc to the linux build.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/118344
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17804 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
| -rw-r--r-- | chrome/browser/dock_info.cc | 8 | ||||
| -rw-r--r-- | chrome/browser/dock_info_gtk.cc | 4 |
2 files changed, 8 insertions, 4 deletions
diff --git a/chrome/browser/dock_info.cc b/chrome/browser/dock_info.cc index 8c4428d..d52ddc9 100644 --- a/chrome/browser/dock_info.cc +++ b/chrome/browser/dock_info.cc @@ -4,7 +4,11 @@ #include "chrome/browser/dock_info.h" +#if defined(TOOLKIT_VIEWS) #include "chrome/browser/views/tabs/tab.h" +#else +#include "chrome/browser/gtk/tabs/tab_gtk.h" +#endif namespace { @@ -60,7 +64,11 @@ bool DockInfo::IsCloseToMonitorPoint(const gfx::Point& screen_loc, case DockInfo::MAXIMIZE: { // Make the maximize height smaller than the tab height to avoid showing // the dock indicator when close to maximized browser. +#if defined(TOOLKIT_VIEWS) hot_spot_delta_y = Tab::GetMinimumUnselectedSize().height() - 1; +#else + hot_spot_delta_y = TabGtk::GetMinimumUnselectedSize().height() - 1; +#endif enable_delta_y = hot_spot_delta_y / 2; break; } diff --git a/chrome/browser/dock_info_gtk.cc b/chrome/browser/dock_info_gtk.cc index 688a2af..e55022b 100644 --- a/chrome/browser/dock_info_gtk.cc +++ b/chrome/browser/dock_info_gtk.cc @@ -173,10 +173,6 @@ class LocalProcessWindowFinder : public BaseWindowFinder { DISALLOW_COPY_AND_ASSIGN(LocalProcessWindowFinder); }; -#if !defined(TOOLKIT_VIEWS) -DockInfo::Factory* DockInfo::factory_ = NULL; -#endif - // static DockInfo DockInfo::GetDockInfoAtPoint(const gfx::Point& screen_point, const std::set<GtkWidget*>& ignore) { |