| Index: chrome/browser/chrome_browser_parts_views.cc
|
| ===================================================================
|
| --- chrome/browser/chrome_browser_parts_views.cc (revision 110826)
|
| +++ chrome/browser/chrome_browser_parts_views.cc (working copy)
|
| @@ -9,7 +9,6 @@
|
| #include "base/command_line.h"
|
| #include "chrome/browser/ui/views/chrome_views_delegate.h"
|
| #include "chrome/common/chrome_switches.h"
|
| -#include "ui/views/desktop/desktop_window_view.h"
|
| #include "views/widget/widget.h"
|
|
|
| ChromeBrowserPartsViews::ChromeBrowserPartsViews()
|
| @@ -28,31 +27,6 @@
|
| }
|
|
|
| void ChromeBrowserPartsViews::PreMainMessageLoopRun() {
|
| -#if !defined(USE_AURA)
|
| - views::Widget::SetPureViews(
|
| - CommandLine::ForCurrentProcess()->HasSwitch(switches::kUsePureViews));
|
| - // Launch the views desktop shell window and register it as the default parent
|
| - // for all unparented views widgets.
|
| - const CommandLine& command_line = *CommandLine::ForCurrentProcess();
|
| - if (command_line.HasSwitch(switches::kViewsDesktop)) {
|
| - std::string desktop_type_cmd =
|
| - command_line.GetSwitchValueASCII(switches::kViewsDesktop);
|
| - if (desktop_type_cmd != "disabled") {
|
| - views::desktop::DesktopWindowView::DesktopType desktop_type;
|
| - if (desktop_type_cmd == "netbook")
|
| - desktop_type = views::desktop::DesktopWindowView::DESKTOP_NETBOOK;
|
| - else if (desktop_type_cmd == "other")
|
| - desktop_type = views::desktop::DesktopWindowView::DESKTOP_OTHER;
|
| - else
|
| - desktop_type = views::desktop::DesktopWindowView::DESKTOP_DEFAULT;
|
| - views::desktop::DesktopWindowView::CreateDesktopWindow(desktop_type);
|
| - ChromeViewsDelegate* chrome_views_delegate = static_cast
|
| - <ChromeViewsDelegate*>(views::ViewsDelegate::views_delegate);
|
| - chrome_views_delegate->default_parent_view =
|
| - views::desktop::DesktopWindowView::desktop_window_view;
|
| - }
|
| - }
|
| -#endif
|
| }
|
|
|
| bool ChromeBrowserPartsViews::MainMessageLoopRun(int* result_code) {
|
|
|