Revert 86914 - Move a bunch of functions from Window onto Widget.

views/widget/widget.cc

 // Copyright (c) 2011 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 "views/widget/widget.h"
 
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "ui/gfx/compositor/compositor.h"
 #include "views/focus/view_storage.h"
@@ skipping 195 matching lines @@
 }
 
 void Widget::Show() {
   native_widget_->Show();
 }
 
 void Widget::Hide() {
   native_widget_->Hide();
 }
 
-void Widget::Activate() {
-  native_widget_->Activate();
-}
-
-void Widget::Deactivate() {
-  native_widget_->Deactivate();
-}
-
 bool Widget::IsActive() const {
   return native_widget_->IsActive();
 }
 
+void Widget::SetOpacity(unsigned char opacity) {
+  native_widget_->SetOpacity(opacity);
+}
+
 void Widget::SetAlwaysOnTop(bool on_top) {
   native_widget_->SetAlwaysOnTop(on_top);
 }
 
-void Widget::Maximize() {
-  native_widget_->Maximize();
-}
-
-void Widget::Minimize() {
-  native_widget_->Minimize();
-}
-
-void Widget::Restore() {
-  native_widget_->Restore();
-}
-
-bool Widget::IsMaximized() const {
-  return native_widget_->IsMaximized();
-}
-
-bool Widget::IsMinimized() const {
-  return native_widget_->IsMinimized();
-}
-
-void Widget::SetOpacity(unsigned char opacity) {
-  native_widget_->SetOpacity(opacity);
-}
-
 View* Widget::GetRootView() {
   if (!root_view_.get()) {
     // First time the root view is being asked for, create it now.
     root_view_.reset(CreateRootView());
   }
   return root_view_.get();
 }
 
 bool Widget::IsVisible() const {
   return native_widget_->IsVisible();
@@ skipping 279 matching lines @@
   gfx::AcceleratedWidget widget = native_widget_->GetAcceleratedWidget();
   if (widget != gfx::kNullAcceleratedWidget)
     compositor_ = ui::Compositor::Create(widget);
 }
 
 bool Widget::ShouldReleaseCaptureOnMouseReleased() const {
   return true;
 }
 
 }  // namespace views