diff options
| -rw-r--r-- | chrome/common/native_window_notification_source.h | 4 | ||||
| -rw-r--r-- | chrome/common/temp_scaffolding_stubs.h | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/chrome/common/native_window_notification_source.h b/chrome/common/native_window_notification_source.h index 0749728..3db7e50 100644 --- a/chrome/common/native_window_notification_source.h +++ b/chrome/common/native_window_notification_source.h @@ -18,8 +18,8 @@ class Source<gfx::NativeWindow> : public NotificationSource { explicit Source(const NotificationSource& other) : NotificationSource(other) {} - HWND operator->() const { return ptr(); } - HWND ptr() const { return static_cast<gfx::NativeWindow>(ptr_); } + gfx::NativeWindow operator->() const { return ptr(); } + gfx::NativeWindow ptr() const { return static_cast<gfx::NativeWindow>(ptr_); } }; #endif // CHROME_COMMON_NATIVE_WINDOW_NOTIFICATION_SOURCE_H_ diff --git a/chrome/common/temp_scaffolding_stubs.h b/chrome/common/temp_scaffolding_stubs.h index b0b7d1a..630d8dd 100644 --- a/chrome/common/temp_scaffolding_stubs.h +++ b/chrome/common/temp_scaffolding_stubs.h @@ -205,6 +205,7 @@ class TableModel { virtual int RowCount() = 0; }; +#if !defined(TOOLKIT_VIEWS) class MenuItemView { public: enum Type { @@ -235,6 +236,7 @@ class MenuItemView { class MenuDelegate { }; +#endif #if !defined(OS_LINUX) class Window { @@ -345,7 +347,7 @@ class DockInfo { }; #endif -#if defined(OS_LINUX) +#if defined(OS_LINUX) && !defined(TOOLKIT_VIEWS) class WindowSizer { public: static void GetBrowserWindowBounds(const std::wstring& app_name, |