summaryrefslogtreecommitdiffstats
path: root/chrome/common
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-28 03:56:03 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-28 03:56:03 +0000
commit33825b8a884c8fb375ae685e9a6a5b0751574a5c (patch)
tree42b2dfb073f755c16de48bb21f3a61a65bd86975 /chrome/common
parent7a9b055f9f02f77df9038bc88e98bac2725b2974 (diff)
downloadchromium_src-33825b8a884c8fb375ae685e9a6a5b0751574a5c.zip
chromium_src-33825b8a884c8fb375ae685e9a6a5b0751574a5c.tar.gz
chromium_src-33825b8a884c8fb375ae685e9a6a5b0751574a5c.tar.bz2
Hopefully fix the linux build.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17063 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common')
-rw-r--r--chrome/common/temp_scaffolding_stubs.cc10
-rw-r--r--chrome/common/temp_scaffolding_stubs.h2
2 files changed, 10 insertions, 2 deletions
diff --git a/chrome/common/temp_scaffolding_stubs.cc b/chrome/common/temp_scaffolding_stubs.cc
index e1d757e..62fc8d7 100644
--- a/chrome/common/temp_scaffolding_stubs.cc
+++ b/chrome/common/temp_scaffolding_stubs.cc
@@ -26,6 +26,10 @@
#include "chrome/browser/download/download_shelf.h"
#endif
+#if defined(OS_LINUX)
+#include "chrome/browser/dock_info.h"
+#endif
+
#if defined(TOOLKIT_VIEWS)
#include "views/controls/menu/chrome_menu.h"
#endif
@@ -315,12 +319,16 @@ void ShowOptionsWindow(OptionsPage page,
}
#endif
-#if defined(OS_MACOSX)
+#if !defined(TOOLKIT_VIEWS)
bool DockInfo::GetNewWindowBounds(gfx::Rect* new_window_bounds,
bool* maximize_new_window) const {
NOTIMPLEMENTED();
return true;
}
+
+void DockInfo::AdjustOtherWindowBounds() const {
+ NOTIMPLEMENTED();
+}
#endif
//------------------------------------------------------------------------------
diff --git a/chrome/common/temp_scaffolding_stubs.h b/chrome/common/temp_scaffolding_stubs.h
index c1ec4fd..a9b5ce6 100644
--- a/chrome/common/temp_scaffolding_stubs.h
+++ b/chrome/common/temp_scaffolding_stubs.h
@@ -343,7 +343,7 @@ class FaviconStatus {
class DockInfo {
public:
bool GetNewWindowBounds(gfx::Rect*, bool*) const;
- void AdjustOtherWindowBounds() const { NOTIMPLEMENTED(); }
+ void AdjustOtherWindowBounds() const;
};
#else