summaryrefslogtreecommitdiffstats
path: root/chrome_frame
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-12 17:02:03 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-12 17:02:03 +0000
commitd68334ccb287de7f752017e147af23f4a61825c3 (patch)
treea44cb54375d1cbc375387b608dc8402845f14b20 /chrome_frame
parent0988a1175265629f7faa692888eeffdd5e0532ec (diff)
downloadchromium_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 'chrome_frame')
-rw-r--r--chrome_frame/test/chrome_frame_test_utils.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome_frame/test/chrome_frame_test_utils.cc b/chrome_frame/test/chrome_frame_test_utils.cc
index 6041030..298a7c2 100644
--- a/chrome_frame/test/chrome_frame_test_utils.cc
+++ b/chrome_frame/test/chrome_frame_test_utils.cc
@@ -531,7 +531,7 @@ std::wstring GetPathAndQueryFromUrl(const std::wstring& url) {
std::wstring GetClipboardText() {
string16 text16;
ui::Clipboard::GetForCurrentThread()->ReadText(
- ui::Clipboard::BUFFER_STANDARD, &text16);
+ ui::CLIPBOARD_TYPE_COPY_PASTE, &text16);
return UTF16ToWide(text16);
}
@@ -542,7 +542,7 @@ void DestroyClipboard() {
void SetClipboardText(const std::wstring& text) {
ui::ScopedClipboardWriter clipboard_writer(
ui::Clipboard::GetForCurrentThread(),
- ui::Clipboard::BUFFER_STANDARD);
+ ui::CLIPBOARD_TYPE_COPY_PASTE);
clipboard_writer.WriteText(WideToUTF16(text));
}