diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-05 00:21:22 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-05 00:21:22 +0000 |
| commit | a13283ccd0eef981bd92b5ba3b78c7d1b4a678f5 (patch) | |
| tree | 2cb114cfcd3d89203d045c56ec2af4d2d52cf9b0 /chrome/browser/ui/omnibox/omnibox_view_browsertest.cc | |
| parent | b09be0a7dace2e86516a2661c9c504d640abed7c (diff) | |
| download | chromium_src-a13283ccd0eef981bd92b5ba3b78c7d1b4a678f5.zip chromium_src-a13283ccd0eef981bd92b5ba3b78c7d1b4a678f5.tar.gz chromium_src-a13283ccd0eef981bd92b5ba3b78c7d1b4a678f5.tar.bz2 | |
Remove TOOLKIT_USES_GTK and consolidate it into TOOLKIT_GTK
Add gtk dependency to base.gyp for android host_os="linux" case
BUG=none
TEST=none
Review URL: https://chromiumcodereview.appspot.com/9969080
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@130784 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.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc b/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc index 523ac9a..3a1cf30 100644 --- a/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc +++ b/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc @@ -37,7 +37,7 @@ #include "ui/base/events.h" #include "ui/base/keycodes/keyboard_codes.h" -#if defined(TOOLKIT_USES_GTK) +#if defined(TOOLKIT_GTK) #include <gdk/gdk.h> #include <gtk/gtk.h> #endif @@ -118,7 +118,7 @@ const struct TestHistoryEntry { {"http://bar/", "Bar", kSearchText, 1, 0, false }, }; -#if defined(TOOLKIT_USES_GTK) +#if defined(TOOLKIT_GTK) // Returns the text stored in the PRIMARY clipboard. std::string GetPrimarySelectionText() { GtkClipboard* clipboard = gtk_clipboard_get(GDK_SELECTION_PRIMARY); @@ -1356,9 +1356,9 @@ IN_PROC_BROWSER_TEST_F(OmniboxViewTest, CtrlKeyPressedWithInlineAutocompleteTest(); } -#if defined(TOOLKIT_USES_GTK) +#if defined(TOOLKIT_GTK) // TODO(oshima): enable these tests for views-implmentation when -// these featuers are supported. +// these featuers are supported. http://crbug.com/121558. IN_PROC_BROWSER_TEST_F(OmniboxViewTest, UndoRedoLinux) { ui_test_utils::NavigateToURL(browser(), GURL(chrome::kAboutBlankURL)); |