diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-12 17:02:03 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-12 17:02:03 +0000 |
| commit | d68334ccb287de7f752017e147af23f4a61825c3 (patch) | |
| tree | a44cb54375d1cbc375387b608dc8402845f14b20 /ash | |
| parent | 0988a1175265629f7faa692888eeffdd5e0532ec (diff) | |
| download | chromium_src-d68334ccb287de7f752017e147af23f4a61825c3.zip chromium_src-d68334ccb287de7f752017e147af23f4a61825c3.tar.gz chromium_src-d68334ccb287de7f752017e147af23f4a61825c3.tar.bz2 | |
bookmarks: Remove Mac specific function from BookmarkNodeData.
This removes another ifdef, which should be avoided in general.
This is a follow up to the clean up started in crrev.com/225862.
See discussion from https://codereview.chromium.org/25022004/
BUG=None
TEST=None, no behavior changed.
R=sky@chromium.org,asvitkine@chromium.org
TBR=darin # for trivial changes in content/
Review URL: https://codereview.chromium.org/25435002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@228347 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash')
| -rw-r--r-- | ash/drag_drop/drag_drop_controller_unittest.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ash/drag_drop/drag_drop_controller_unittest.cc b/ash/drag_drop/drag_drop_controller_unittest.cc index 0538002..39f9974 100644 --- a/ash/drag_drop/drag_drop_controller_unittest.cc +++ b/ash/drag_drop/drag_drop_controller_unittest.cc @@ -657,11 +657,11 @@ TEST_F(DragDropControllerTest, DragLeavesClipboardAloneTest) { std::string clip_str("I am on the clipboard"); { // We first copy some text to the clipboard. - ui::ScopedClipboardWriter scw(cb, ui::Clipboard::BUFFER_STANDARD); + ui::ScopedClipboardWriter scw(cb, ui::CLIPBOARD_TYPE_COPY_PASTE); scw.WriteText(ASCIIToUTF16(clip_str)); } EXPECT_TRUE(cb->IsFormatAvailable(ui::Clipboard::GetPlainTextFormatType(), - ui::Clipboard::BUFFER_STANDARD)); + ui::CLIPBOARD_TYPE_COPY_PASTE)); scoped_ptr<views::Widget> widget(CreateNewWidget()); DragTestView* drag_view = new DragTestView; @@ -682,8 +682,8 @@ TEST_F(DragDropControllerTest, DragLeavesClipboardAloneTest) { // Verify the clipboard contents haven't changed std::string result; EXPECT_TRUE(cb->IsFormatAvailable(ui::Clipboard::GetPlainTextFormatType(), - ui::Clipboard::BUFFER_STANDARD)); - cb->ReadAsciiText(ui::Clipboard::BUFFER_STANDARD, &result); + ui::CLIPBOARD_TYPE_COPY_PASTE)); + cb->ReadAsciiText(ui::CLIPBOARD_TYPE_COPY_PASTE, &result); EXPECT_EQ(clip_str, result); // Destory the clipboard here because ash doesn't delete it. // crbug.com/158150. |