From 4fc08c08f72dfe451e1bf587db6bfad0c7137656 Mon Sep 17 00:00:00 2001
From: "saintlou@chromium.org"
<saintlou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Tue, 3 May 2011 21:54:00 +0000
Subject: Use single command line flag for all pure Views situations, rather
than enabling case by case
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/6911018
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@83972 0039d316-1c4b-4281-b951-d872f2087c98
---
views/controls/combobox/native_combobox_views.cc | 7 ++-----
views/controls/textfield/native_textfield_views.cc | 7 ++-----
2 files changed, 4 insertions(+), 10 deletions(-)
(limited to 'views/controls')
diff --git a/views/controls/combobox/native_combobox_views.cc b/views/controls/combobox/native_combobox_views.cc
index 4a77f7a..0de6b5fe9 100644
--- a/views/controls/combobox/native_combobox_views.cc
+++ b/views/controls/combobox/native_combobox_views.cc
@@ -18,6 +18,7 @@
#include "views/controls/combobox/combobox.h"
#include "views/controls/focusable_border.h"
#include "views/controls/menu/menu_2.h"
+#include "views/widget/root_view.h"
#if defined(OS_LINUX)
#include "ui/gfx/gtk_util.h"
@@ -48,8 +49,6 @@ const int kComboboxArrowMargin = 12;
const SkColor kDefaultBorderColor = SK_ColorGRAY;
const SkColor kTextColor = SK_ColorBLACK;
-// A switch to enable NativeTextfieldViews;
-const char kEnableComboboxViewsSwitch[] = "enable-combobox-views";
} // namespace
namespace views {
@@ -208,9 +207,7 @@ bool NativeComboboxViews::IsComboboxViewsEnabled() {
#if defined(TOUCH_UI)
return true;
#else
- return combobox_view_enabled ||
- CommandLine::ForCurrentProcess()->HasSwitch(
- kEnableComboboxViewsSwitch);
+ return combobox_view_enabled || RootView::IsPureViews();
#endif
}
diff --git a/views/controls/textfield/native_textfield_views.cc b/views/controls/textfield/native_textfield_views.cc
index 77b8098..4b6c2fd 100644
--- a/views/controls/textfield/native_textfield_views.cc
+++ b/views/controls/textfield/native_textfield_views.cc
@@ -27,6 +27,7 @@
#include "views/ime/input_method.h"
#include "views/metrics.h"
#include "views/views_delegate.h"
+#include "views/widget/root_view.h"
#if defined(OS_LINUX)
#include "ui/gfx/gtk_util.h"
@@ -50,8 +51,6 @@ const SkColor kCursorColor = SK_ColorBLACK;
const int kCursorVisibleTimeMs = 800;
const int kCursorInvisibleTimeMs = 500;
-// A switch to enable NativeTextfieldViews;
-const char kEnableViewsBasedTextfieldSwitch[] = "enable-textfield-views";
} // namespace
namespace views {
@@ -393,9 +392,7 @@ bool NativeTextfieldViews::IsTextfieldViewsEnabled() {
#if defined(TOUCH_UI)
return true;
#else
- return textfield_view_enabled ||
- CommandLine::ForCurrentProcess()->HasSwitch(
- kEnableViewsBasedTextfieldSwitch);
+ return textfield_view_enabled || RootView::IsPureViews();
#endif
}
--
cgit v1.1