summaryrefslogtreecommitdiffstats
path: root/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc
diff options
context:
space:
mode:
authorchromium@hybridsource.org <chromium@hybridsource.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-28 04:06:43 +0000
committerchromium@hybridsource.org <chromium@hybridsource.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-28 04:06:43 +0000
commit1fd5302cf7083ff593667703d144aa84d3cf7e5d (patch)
treed64d5a1e377638aa696b57d4ba2bb928779752b5 /chrome/browser/ui/omnibox/omnibox_view_browsertest.cc
parent8b02f7de252dba372f6f393a2f0130f893af3cb9 (diff)
downloadchromium_src-1fd5302cf7083ff593667703d144aa84d3cf7e5d.zip
chromium_src-1fd5302cf7083ff593667703d144aa84d3cf7e5d.tar.gz
chromium_src-1fd5302cf7083ff593667703d144aa84d3cf7e5d.tar.bz2
Replace many OS_LINUX ifdefs with OS_POSIX & !OS_MACOSX, since most of them apply to non-linux Unix also. Non-linux Unices tested are the BSDs and Solaris.
Review URL: http://codereview.chromium.org/3556009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@87156 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/omnibox/omnibox_view_browsertest.cc')
-rw-r--r--chrome/browser/ui/omnibox/omnibox_view_browsertest.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc b/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc
index eea744e..f998f16 100644
--- a/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc
+++ b/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc
@@ -33,7 +33,7 @@
#include "ui/base/events.h"
#include "ui/base/keycodes/keyboard_codes.h"
-#if defined(OS_LINUX)
+#if defined(TOOLKIT_USES_GTK)
#include <gdk/gdk.h>
#include <gtk/gtk.h>
#endif
@@ -112,7 +112,7 @@ const struct TestHistoryEntry {
{"http://bar/", "Bar", kSearchText, 1, 0, false },
};
-#if defined(OS_LINUX)
+#if defined(TOOLKIT_USES_GTK)
// Returns the text stored in the PRIMARY clipboard.
std::string GetPrimarySelectionText() {
GtkClipboard* clipboard = gtk_clipboard_get(GDK_SELECTION_PRIMARY);
@@ -1191,7 +1191,7 @@ IN_PROC_BROWSER_TEST_F(OmniboxViewTest,
CtrlKeyPressedWithInlineAutocompleteTest();
}
-#if defined(OS_LINUX)
+#if defined(TOOLKIT_USES_GTK)
// TODO(oshima): enable these tests for views-implmentation when
// these featuers are supported.