diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-30 09:17:52 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-30 09:17:52 +0000 |
| commit | 984516986236713734cacbe29c067eb9a87c7bcc (patch) | |
| tree | f6b22dd822d9ee13ad10535ecd675ad66aabe31c | |
| parent | 21230ca28de3efce202f19db41b9e1f51743d8d4 (diff) | |
| download | chromium_src-984516986236713734cacbe29c067eb9a87c7bcc.zip chromium_src-984516986236713734cacbe29c067eb9a87c7bcc.tar.gz chromium_src-984516986236713734cacbe29c067eb9a87c7bcc.tar.bz2 | |
Fix bustage by fixing defines not to include windows.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17286 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/views/frame/browser_view.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/window_sizer.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/views/frame/browser_view.cc b/chrome/browser/views/frame/browser_view.cc index faf0f0b..ac9201d 100644 --- a/chrome/browser/views/frame/browser_view.cc +++ b/chrome/browser/views/frame/browser_view.cc @@ -621,7 +621,7 @@ BrowserWindowTesting* BrowserView::GetBrowserWindowTesting() { } StatusBubble* BrowserView::GetStatusBubble() { -#if !defined(TOOLKIT_VIEWS) +#if defined(OS_WIN) return status_bubble_.get(); #else return NULL; diff --git a/chrome/browser/window_sizer.cc b/chrome/browser/window_sizer.cc index 3ea50f8..a0f9393 100644 --- a/chrome/browser/window_sizer.cc +++ b/chrome/browser/window_sizer.cc @@ -111,7 +111,7 @@ void WindowSizer::GetBrowserWindowBounds(const std::wstring& app_name, Browser* browser, gfx::Rect* window_bounds, bool* maximized) { -#if defined(TOOLKIT_VIEWS) +#if !defined(OS_WIN) && defined(TOOLKIT_VIEWS) *window_bounds = gfx::Rect(20, 20, 500, 500); *maximized = false; return; |