Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(50)

Unified Diff: views/controls/single_split_view.cc

Issue 7996008: Get views and views_unittests to build w/ use_aura=1 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed review issue Created 9 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « views/controls/link.cc ('k') | views/controls/textfield/native_textfield_views_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: views/controls/single_split_view.cc
diff --git a/views/controls/single_split_view.cc b/views/controls/single_split_view.cc
index d566d88840ffecc28df206203d05b0591c1c6aba..f8df5781e1e00132d5226166025bf19d047c1461 100644
--- a/views/controls/single_split_view.cc
+++ b/views/controls/single_split_view.cc
@@ -4,7 +4,7 @@
#include "views/controls/single_split_view.h"
-#if defined(OS_LINUX)
+#if defined(TOOLKIT_USES_GTK)
#include <gdk/gdk.h>
#endif
@@ -13,7 +13,7 @@
#include "ui/gfx/canvas.h"
#include "views/background.h"
-#if defined(OS_LINUX)
+#if defined(TOOLKIT_USES_GTK)
#include "ui/gfx/gtk_util.h"
#endif
@@ -100,12 +100,12 @@ gfx::NativeCursor SingleSplitView::GetCursor(const MouseEvent& event) {
static HCURSOR we_resize_cursor = LoadCursor(NULL, IDC_SIZEWE);
static HCURSOR ns_resize_cursor = LoadCursor(NULL, IDC_SIZENS);
return is_horizontal_ ? we_resize_cursor : ns_resize_cursor;
-#elif defined(USE_AURA)
- // TODO(saintlou):
- return NULL;
-#elif defined(OS_LINUX)
+#elif defined(TOOLKIT_USES_GTK)
return gfx::GetCursor(is_horizontal_ ? GDK_SB_H_DOUBLE_ARROW :
GDK_SB_V_DOUBLE_ARROW);
+#else
+ // TODO(saintlou):
+ return NULL;
#endif
}
« no previous file with comments | « views/controls/link.cc ('k') | views/controls/textfield/native_textfield_views_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698