Chromium Code Reviews| Index: chrome/browser/browser_main.cc |
| diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc |
| index 8958872415d194533730c89dfbe9c50dd47feab7..d976534b53e4be63887946a4d3b738ba6178ba5e 100644 |
| --- a/chrome/browser/browser_main.cc |
| +++ b/chrome/browser/browser_main.cc |
| @@ -155,6 +155,9 @@ |
| #if defined(TOOLKIT_VIEWS) |
| #include "chrome/browser/views/chrome_views_delegate.h" |
| #include "views/focus/accelerator_handler.h" |
| +#if defined(OS_LINUX) |
|
rjkroege
2010/12/15 21:23:31
Why OS_LINUX? We have been TOUCH_UI for the touch
oshima
2010/12/16 01:15:19
This currently does not compile on Windows due to
|
| +#include "views/controls/textfield/native_textfield_view.h" |
| +#endif |
| #endif |
| #if defined(OS_CHROMEOS) |
| @@ -893,6 +896,12 @@ void InitializeToolkit(const MainFunctionParams& parameters) { |
| // display the correct icon. |
| if (!views::ViewsDelegate::views_delegate) |
| views::ViewsDelegate::views_delegate = new ChromeViewsDelegate; |
| + |
| +#if defined(OS_LINUX) |
| + if (parameters.command_line_.HasSwitch(switches::kEnableTextfieldView)) |
|
beng (no_code_reviews)
2010/12/15 20:42:00
This check should be done inside CreateWrapper, ra
oshima
2010/12/16 01:15:19
I originally had it in CreateWrapper, but I moved
|
| + views::NativeTextfieldView::SetEnableTextfieldView(true); |
| +#endif |
| + |
| #endif |
| #if defined(OS_WIN) |