diff options
| -rw-r--r-- | chrome/browser/dock_info.cc | 8 | ||||
| -rw-r--r-- | chrome/browser/dock_info_gtk.cc | 4 | ||||
| -rw-r--r-- | chrome/chrome.gyp | 2 | ||||
| -rw-r--r-- | chrome/common/temp_scaffolding_stubs.cc | 2 |
4 files changed, 10 insertions, 6 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) { diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index 1a4c6c5..3432372 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -1645,6 +1645,7 @@ 'browser/automation/automation_provider_list_generic.cc', 'browser/bookmarks/bookmark_context_menu.cc', 'browser/bookmarks/bookmark_drop_info.cc', + 'browser/dock_info.cc', 'browser/password_manager/password_store_gnome.h', 'browser/password_manager/password_store_gnome.cc', 'browser/password_manager/password_store_kwallet.h', @@ -1840,7 +1841,6 @@ 'browser/browser_accessibility.cc', 'browser/browser_accessibility_manager.cc', 'browser/extensions/extension_shelf.cc', - 'browser/dock_info.cc', 'browser/dom_ui/html_dialog_contents.cc', 'browser/encoding_menu_controller_delegate.cc', 'browser/external_tab_container.cc', diff --git a/chrome/common/temp_scaffolding_stubs.cc b/chrome/common/temp_scaffolding_stubs.cc index df3e258..3ca4021 100644 --- a/chrome/common/temp_scaffolding_stubs.cc +++ b/chrome/common/temp_scaffolding_stubs.cc @@ -294,7 +294,7 @@ void ShowOptionsWindow(OptionsPage page, } #endif -#if !defined(TOOLKIT_VIEWS) +#if defined(OS_MACOSX) bool DockInfo::GetNewWindowBounds(gfx::Rect* new_window_bounds, bool* maximize_new_window) const { NOTIMPLEMENTED(); |