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

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

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

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=134714

[Ben Goodger (Google), 2012-04-29 14:32:38]

lgtm

On Sat, Apr 28, 2012 at 7:16 PM, <tfarina@chromium.org> wrote:

> Reviewers: Ben Goodger (Google),
>
> Description:
> browser: Remove window.{cc,h} module completely.
>
> R=ben@chromium.org
>
>
> Please review this at
http://codereview.chromium.**org/10271002/<http://codereview.chromium.org/102...
>
> SVN Base:
svn://svn.chromium.org/chrome/**trunk/src<http://svn.chromium.org/chrome/trunk/src>
>
> Affected files:
>  M chrome/browser/chromeos/**status/data_promo_**notification.cc
>  M chrome/browser/chromeos/ui/**setting_level_bubble.cc
>  M chrome/browser/ui/views/**extensions/extension_dialog.cc
>  M chrome/browser/ui/views/**keyboard_overlay_dialog_view.**cc
>  D chrome/browser/ui/views/**window.h
>  D chrome/browser/ui/views/**window.cc
>  M chrome/chrome_browser.gypi
>
>
> Index: chrome/browser/ui/views/**window.cc
> diff --git a/chrome/browser/ui/views/**window.cc
> b/chrome/browser/ui/views/**window.cc
> deleted file mode 100644
> index a02ed73978dc8b8bf0b545f25f1562**ef7f3d92bb..**
> 000000000000000000000000000000**0000000000
> --- a/chrome/browser/ui/views/**window.cc
> +++ /dev/null
> @@ -1,36 +0,0 @@
> -// 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
> Index: chrome/browser/ui/views/**window.h
> diff --git a/chrome/browser/ui/views/**window.h b/chrome/browser/ui/views/
> **window.h
> deleted file mode 100644
> index 5a242af7c48208402f2f695bcdbd03**13d3fe4076..**
> 000000000000000000000000000000**0000000000
> --- a/chrome/browser/ui/views/**window.h
> +++ /dev/null
> @@ -1,24 +0,0 @@
> -// 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_
> Index: chrome/browser/chromeos/**status/data_promo_**notification.cc
> diff --git a/chrome/browser/chromeos/**status/data_promo_**notification.cc
> b/chrome/browser/chromeos/**status/data_promo_**notification.cc
> index 5182451db34c881e857ba5551e28a8**c7d8ef13a9..**
> 0fe399e893717b49f60140a95cb46d**0aaf71cd55 100644
> --- a/chrome/browser/chromeos/**status/data_promo_**notification.cc
> +++ b/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"
> Index: chrome/browser/chromeos/ui/**setting_level_bubble.cc
> diff --git a/chrome/browser/chromeos/ui/**setting_level_bubble.cc
> b/chrome/browser/chromeos/ui/**setting_level_bubble.cc
> index 5de49eb6ee08cf7f0fa5cd015695be**5b536cb9e8..**
> be010fad8f9c75b132a126db73a66a**ef3d70c95e 100644
> --- a/chrome/browser/chromeos/ui/**setting_level_bubble.cc
> +++ b/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"
> Index: chrome/browser/ui/views/**extensions/extension_dialog.cc
> diff --git a/chrome/browser/ui/views/**extensions/extension_dialog.cc
> b/chrome/browser/ui/views/**extensions/extension_dialog.cc
> index 66d693981e1fd042c24966f6c01778**50d02e2a71..**
> 6b19e2337c1fe4bad686d48a5fd3db**ed695582c3 100644
> --- a/chrome/browser/ui/views/**extensions/extension_dialog.cc
> +++ b/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();
> Index: chrome/browser/ui/views/**keyboard_overlay_dialog_view.**cc
> diff --git a/chrome/browser/ui/views/**keyboard_overlay_dialog_view.**cc
> b/chrome/browser/ui/views/**keyboard_overlay_dialog_view.**cc
> index e9a3c66c60697e96c94bf21e46be96**6b8fddf968..**
> 4e2c4ae8db5bc24d7a7c9287584c14**e438e145c4 100644
> --- a/chrome/browser/ui/views/**keyboard_overlay_dialog_view.**cc
> +++ b/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)**;
> Index: chrome/chrome_browser.gypi
> diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
> index 41d7704fb8cd3b88c90d6ebc1c23d6**f05627e7e1..**
> 8fe019d5c58098a533fda1c1dd3353**189cbeaadf 100644
> --- a/chrome/chrome_browser.gypi
> +++ b/chrome/chrome_browser.gypi
> @@ -3559,8 +3559,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',
> @@ -5015,8 +5013,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']**,
>
>
>