browser: Remove window.{cc,h} module completely.

R=ben@chromium.org
TBR=stevenjb@chromium.org

Review URL: https://chromiumcodereview.appspot.com/10271002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@134714 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/chromeos/status/data_promo_notification.cc

@@ -19,7 +19,6 @@
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
-#include "chrome/browser/ui/views/window.h"
 #include "chrome/common/pref_names.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"

chrome/browser/chromeos/ui/setting_level_bubble.cc

@@ -17,7 +17,6 @@
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_window.h"
-#include "chrome/browser/ui/views/window.h"
 #include "ui/gfx/screen.h"
 #include "ui/views/bubble/bubble_delegate.h"
 #include "ui/views/layout/fill_layout.h"

chrome/browser/ui/views/extensions/extension_dialog.cc

@@ -10,7 +10,6 @@
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/views/extensions/extension_dialog_observer.h"
-#include "chrome/browser/ui/views/window.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
@@ -136,7 +135,12 @@ void ExtensionDialog::InitWindowFullscreen() {
       gfx::Screen::GetMonitorNearestWindow(root_window).bounds();
 
   // We want to be the fullscreen topmost child of the root window.
-  window_ = browser::CreateFramelessViewsWindow(root_window, this);
+  window_ = new views::Widget;
+  views::Widget::InitParams params(
+      views::Widget::InitParams::TYPE_WINDOW_FRAMELESS);
+  params.delegate = this;
+  params.parent = root_window;
+  window_->Init(params);
   window_->StackAtTop();
   window_->SetBounds(screen_rect);
   window_->Show();

chrome/browser/ui/views/keyboard_overlay_dialog_view.cc

@@ -10,7 +10,6 @@
 #include "chrome/browser/ui/views/accelerator_table.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/browser/ui/views/keyboard_overlay_delegate.h"
-#include "chrome/browser/ui/views/window.h"
 #include "content/public/browser/native_web_keyboard_event.h"
 #include "grit/generated_resources.h"
 #include "ui/base/keycodes/keyboard_codes.h"
@@ -81,19 +80,24 @@ bool KeyboardOverlayDialogView::AcceleratorPressed(
   return true;
 }
 
-void KeyboardOverlayDialogView::ShowDialog(
-    gfx::NativeWindow owning_window, BrowserView* parent_view) {
+void KeyboardOverlayDialogView::ShowDialog(gfx::NativeWindow owning_window,
+                                           BrowserView* parent_view) {
   // Temporarily disable Shift+Alt. crosbug.com/17208.
   chromeos::input_method::InputMethodManager::GetInstance()->DisableHotkeys();
 
   KeyboardOverlayDelegate* delegate = new KeyboardOverlayDelegate(
       l10n_util::GetStringUTF16(IDS_KEYBOARD_OVERLAY_TITLE));
-  KeyboardOverlayDialogView* view =
-      new KeyboardOverlayDialogView(parent_view->browser()->profile(),
-                                    delegate,
-                                    parent_view);
+  KeyboardOverlayDialogView* view = new KeyboardOverlayDialogView(
+      parent_view->browser()->profile(), delegate, parent_view);
   delegate->set_view(view);
-  browser::CreateFramelessViewsWindow(owning_window, view);
+
+  views::Widget* widget = new views::Widget;
+  views::Widget::InitParams params(
+      views::Widget::InitParams::TYPE_WINDOW_FRAMELESS);
+  params.delegate = view;
+  params.parent = owning_window;
+  widget->Init(params);
+
   // Show the widget at the bottom of the work area.
   gfx::Size size;
   delegate->GetDialogSize(&size);

chrome/browser/ui/views/window.cc

-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "chrome/browser/ui/views/window.h"
-
-#include "ui/views/bubble/bubble_delegate.h"
-#include "ui/views/widget/widget.h"
-
-// Note: This file should be removed after the old ChromeOS frontend is removed.
-//       It is not needed for Aura.
-//       The visual style implemented by BubbleFrameView/BubbleWindow for
-//       ChromeOS should move to Ash.
-//       Calling code should just call the standard views Widget creation
-//       methods and "the right thing" should just happen.
-//       The remainder of the code here is dealing with the legacy CrOS WM and
-//       can also be removed.
-
-namespace browser {
-
-views::Widget* CreateFramelessViewsWindow(gfx::NativeWindow parent,
-                                          views::WidgetDelegate* delegate) {
-  views::Widget* widget = new views::Widget;
-  views::Widget::InitParams params(
-      views::Widget::InitParams::TYPE_WINDOW_FRAMELESS);
-  params.delegate = delegate;
-  // Will this function be called if !defined(USE_AURA)?
-#if defined(OS_WIN) || defined(USE_AURA)
-  params.parent = parent;
-#endif
-  // No frame so does not need params.transparent = true
-  widget->Init(params);
-  return widget;
-}
-
-}  // namespace browser

chrome/browser/ui/views/window.h

-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef CHROME_BROWSER_UI_VIEWS_WINDOW_H_
-#define CHROME_BROWSER_UI_VIEWS_WINDOW_H_
-#pragma once
-
-#include "ui/gfx/native_widget_types.h"
-
-namespace views {
-class Widget;
-class WidgetDelegate;
-}
-
-namespace browser {
-
-// Create a frameless window for given |delegate|.
-views::Widget* CreateFramelessViewsWindow(gfx::NativeWindow parent,
-                                          views::WidgetDelegate* delegate);
-
-}  // namespace browser
-
-#endif  // CHROME_BROWSER_UI_VIEWS_WINDOW_H_

chrome/chrome_browser.gypi

@@ -3565,8 +3565,6 @@
         'browser/ui/views/web_dialog_view.cc',
         'browser/ui/views/web_dialog_view.h',
         'browser/ui/views/web_intent_picker_views.cc',
-        'browser/ui/views/window.cc',
-        'browser/ui/views/window.h',
         'browser/ui/views/wrench_menu.cc',
         'browser/ui/views/wrench_menu.h',
         'browser/ui/virtual_keyboard/virtual_keyboard_manager.cc',
@@ -5026,8 +5024,6 @@
                 ['include', '^browser/ui/views/web_dialog_view.cc'],
                 ['include', '^browser/ui/views/web_dialog_view.h'],
                 ['include', '^browser/ui/views/web_intent_picker_views.cc'],
-                ['include', '^browser/ui/views/window.cc'],
-                ['include', '^browser/ui/views/window.h'],
                 ['include', '^browser/ui/views/wrench_menu.cc'],
                 ['include', '^browser/ui/views/wrench_menu.h'],
                 ['include', '^browser/ui/window_sizer.cc'],