Revert 256563 "Reland r256396 Add views implementation for AXTre..."

trunk/src/chrome/browser/ui/views/panels/panel_view.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/panels/panel_view.h"
 
 #include <map>
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 293 matching lines @@
 #if defined(OS_WIN)
   ui::win::SetAppIdForWindow(
       ShellIntegration::GetAppModelIdForProfile(
           base::UTF8ToWide(panel->app_name()), panel->profile()->GetPath()),
       views::HWNDForWidget(window_));
   ui::win::PreventWindowFromPinning(views::HWNDForWidget(window_));
 #endif
 }
 
 PanelView::~PanelView() {
-  if (window_)
-    window_->RemoveObserver(this);
 }
 
 void PanelView::ShowPanel() {
   ShowPanelInactive();
   ActivatePanel();
 }
 
 void PanelView::ShowPanelInactive() {
   if (window_->IsVisible())
     return;
@@ skipping 448 matching lines @@
   else
     return *app_icon.ToImageSkia();
 }
 
 gfx::ImageSkia PanelView::GetWindowIcon() {
   gfx::Image icon = panel_->GetCurrentPageIcon();
   return icon.IsEmpty() ? gfx::ImageSkia() : *icon.ToImageSkia();
 }
 
 void PanelView::WindowClosing() {
-
   // When closing a panel via window.close, API or the close button,
   // ClosePanel() is called first, destroying the native |window_|
   // which results in this method being called. ClosePanel() sets
   // |window_closed_| to NULL.
   // If we still have a |window_closed_| here, the close was triggered by the
   // OS, (e.g. clicking on taskbar menu), which destroys the native |window_|
   // without invoking ClosePanel() beforehand.
   if (!window_closed_) {
     panel_->OnWindowClosing();
     ClosePanel();
@@ skipping 149 matching lines @@
 
   const std::map<ui::Accelerator, int>& accelerator_table =
       GetAcceleratorTable();
   std::map<ui::Accelerator, int>::const_iterator iter =
       accelerator_table.find(accelerator);
   DCHECK(iter != accelerator_table.end());
   return panel_->ExecuteCommandIfEnabled(iter->second);
 }
 
 void PanelView::OnWidgetDestroying(views::Widget* widget) {
-  if (window_) {
-    window_->RemoveObserver(this);
-    window_ = NULL;
-  }
+  window_ = NULL;
 }
 
 void PanelView::OnWidgetActivationChanged(views::Widget* widget, bool active) {
 #if defined(OS_WIN)
   // WM_NCACTIVATED could be sent when an active window is being destroyed on
   // Windows. We need to guard against this.
   if (window_closed_)
     return;
 
   bool focused = active;
@@ skipping 164 matching lines @@
   // SWP_FRAMECHANGED flag must be called in order for the cached window data
   // to be updated properly.
   // http://msdn.microsoft.com/en-us/library/windows/desktop/ms633591(v=vs.85).aspx
   if (update_frame) {
     ::SetWindowPos(native_window, NULL, 0, 0, 0, 0,
                    SWP_FRAMECHANGED | SWP_NOMOVE | SWP_NOSIZE |
                        SWP_NOZORDER | SWP_NOACTIVATE);
   }
 }
 #endif