diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-13 23:21:45 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-13 23:21:45 +0000 |
| commit | 321792ef1baac764227d55fc944f32cf29e50c6a (patch) | |
| tree | 58acd23f1f5d4fc2e33e07e188210d2836fc84f2 /chrome | |
| parent | 4343dfbb634893311ae654e412d704831c8ba5ac (diff) | |
| download | chromium_src-321792ef1baac764227d55fc944f32cf29e50c6a.zip chromium_src-321792ef1baac764227d55fc944f32cf29e50c6a.tar.gz chromium_src-321792ef1baac764227d55fc944f32cf29e50c6a.tar.bz2 | |
Stubs out OSExchangeData for views on gtk.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/113321
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16012 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/bookmarks/bookmark_drag_data.cc | 3 | ||||
| -rw-r--r-- | chrome/browser/bookmarks/bookmark_drag_data_unittest.cc | 4 | ||||
| -rw-r--r-- | chrome/chrome.gyp | 14 | ||||
| -rw-r--r-- | chrome/common/temp_scaffolding_stubs.h | 2 | ||||
| -rw-r--r-- | chrome/test/unit/unittests.vcproj | 2 |
5 files changed, 17 insertions, 8 deletions
diff --git a/chrome/browser/bookmarks/bookmark_drag_data.cc b/chrome/browser/bookmarks/bookmark_drag_data.cc index 4b3bdb6..c5a56ed 100644 --- a/chrome/browser/bookmarks/bookmark_drag_data.cc +++ b/chrome/browser/bookmarks/bookmark_drag_data.cc @@ -5,7 +5,7 @@ #include "chrome/browser/bookmarks/bookmark_drag_data.h" // TODO(port): Port this file. -#if defined(OS_WIN) +#if defined(TOOLKIT_VIEWS) #include "app/os_exchange_data.h" #else #include "chrome/common/temp_scaffolding_stubs.h" @@ -17,7 +17,6 @@ #include "chrome/browser/profile.h" #include "chrome/common/url_constants.h" - #if defined(OS_WIN) static CLIPFORMAT clipboard_format = 0; #endif diff --git a/chrome/browser/bookmarks/bookmark_drag_data_unittest.cc b/chrome/browser/bookmarks/bookmark_drag_data_unittest.cc index 1d1e1f2..9507196 100644 --- a/chrome/browser/bookmarks/bookmark_drag_data_unittest.cc +++ b/chrome/browser/bookmarks/bookmark_drag_data_unittest.cc @@ -22,7 +22,7 @@ TEST_F(BookmarkDragDataTest, InitialState) { TEST_F(BookmarkDragDataTest, BogusRead) { scoped_refptr<OSExchangeData> data(new OSExchangeData()); BookmarkDragData drag_data; - EXPECT_FALSE(drag_data.Read(data.get())); + EXPECT_FALSE(drag_data.Read(OSExchangeData(data.get()))); EXPECT_FALSE(drag_data.is_valid()); } @@ -36,7 +36,7 @@ TEST_F(BookmarkDragDataTest, JustURL) { data->SetURL(url, title); BookmarkDragData drag_data; - EXPECT_TRUE(drag_data.Read(data.get())); + EXPECT_TRUE(drag_data.Read(OSExchangeData(data.get()))); EXPECT_TRUE(drag_data.is_valid()); ASSERT_EQ(1, drag_data.elements.size()); EXPECT_TRUE(drag_data.elements[0].is_url); diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index 4082664..7634269 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -202,7 +202,8 @@ '../app/l10n_util_win.cc', '../app/l10n_util_win.h', '../app/message_box_flags.h', - '../app/os_exchange_data.cc', + '../app/os_exchange_data_win.cc', + '../app/os_exchange_data_gtk.cc', '../app/os_exchange_data.h', '../app/resource_bundle.cc', '../app/resource_bundle.h', @@ -238,7 +239,14 @@ '../app/gfx/icon_util.cc', '../app/gfx/icon_util.h', '../app/os_exchange_data.cc', - '../app/os_exchange_data.h', + ], + 'conditions': [ + ['toolkit_views!="1"', { + 'sources!': [ + '../app/os_exchange_data.h', + '../app/os_exchange_data_gtk.cc', + ], + }], ], }], ], @@ -1588,7 +1596,7 @@ '../third_party/GTM', '../third_party/GTM/AppKit', ], - }], + }], ['OS=="win"', { 'defines': [ '__STD_C', diff --git a/chrome/common/temp_scaffolding_stubs.h b/chrome/common/temp_scaffolding_stubs.h index 35904d2..a5bd9b0 100644 --- a/chrome/common/temp_scaffolding_stubs.h +++ b/chrome/common/temp_scaffolding_stubs.h @@ -461,11 +461,13 @@ class FontsLanguagesWindowView { void SelectLanguagesTab() { NOTIMPLEMENTED(); } }; +#if !defined(TOOLKIT_VIEWS) class OSExchangeData { public: void SetString(const std::wstring& data) { NOTIMPLEMENTED(); } void SetURL(const GURL& url, const std::wstring& title) { NOTIMPLEMENTED(); } }; +#endif class BaseDragSource { }; diff --git a/chrome/test/unit/unittests.vcproj b/chrome/test/unit/unittests.vcproj index 025ce8b..f18b051 100644 --- a/chrome/test/unit/unittests.vcproj +++ b/chrome/test/unit/unittests.vcproj @@ -1120,7 +1120,7 @@ > </File> <File - RelativePath="..\..\..\app\os_exchange_data_unittest.cc" + RelativePath="..\..\..\app\os_exchange_data_win_unittest.cc" > </File> <File |