Revert 71230 to see if it is related to hang on linux interactive_ui_tests....

chrome/browser/ui/views/frame/browser_view.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_
 #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_
 #pragma once
 
 #include <map>
 #include <string>
 #include <vector>
 
 #include "app/menus/simple_menu_model.h"
 #include "base/scoped_ptr.h"
 #include "base/timer.h"
 #include "build/build_config.h"
 #include "chrome/browser/browser_window.h"
 #include "chrome/browser/tabs/tab_strip_model_observer.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/views/frame/browser_bubble_host.h"
 #include "chrome/browser/ui/views/frame/browser_frame.h"
 #include "chrome/browser/ui/views/infobars/infobar_container.h"
 #include "chrome/browser/ui/views/tab_contents/tab_contents_container.h"
 #include "chrome/browser/ui/views/tabs/tab_strip.h"
 #include "chrome/browser/ui/views/tabs/base_tab_strip.h"
 #include "chrome/browser/ui/views/unhandled_keyboard_event_handler.h"
 #include "chrome/common/notification_registrar.h"
 #include "gfx/native_widget_types.h"
-#include "views/controls/single_split_view.h"
 #include "views/window/client_view.h"
 #include "views/window/window_delegate.h"
 
 #if defined(OS_WIN)
 #include "chrome/browser/hang_monitor/hung_plugin_action.h"
 #include "chrome/browser/hang_monitor/hung_window_detector.h"
 #include "views/controls/menu/native_menu_win.h"
 #endif
 
 // NOTE: For more information about the objects and files in this directory,
 // view: http://dev.chromium.org/developers/design-documents/browser-window
 
 class AccessiblePaneView;
 class AccessibleViewHelper;
 class BookmarkBarView;
 class Browser;
 class BrowserBubble;
 class BrowserViewLayout;
 class ContentsContainer;
 class DownloadShelfView;
 class EncodingMenuModel;
 class FullscreenExitBubble;
 class HtmlDialogUIDelegate;
 class InfoBarContainer;
 class LocationBarView;
 class SideTabStrip;
 class StatusBubbleViews;
-class TabContentsContainer;
 class TabStripModel;
 class ToolbarView;
 class ZoomMenuModel;
 class Extension;
 
 #if defined(OS_WIN)
 class AeroPeekManager;
 class JumpList;
 #endif
 
 namespace views {
 class ExternalFocusTracker;
 class Menu;
+class SingleSplitView;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // BrowserView
 //
 //  A ClientView subclass that provides the contents of a browser window,
 //  including the TabStrip, toolbars, download shelves, the content area etc.
 //
 class BrowserView : public BrowserBubbleHost,
                     public BrowserWindow,
                     public BrowserWindowTesting,
                     public NotificationObserver,
                     public TabStripModelObserver,
                     public menus::SimpleMenuModel::Delegate,
                     public views::WindowDelegate,
                     public views::ClientView,
                     public InfoBarContainer::Delegate,
-                    public views::SingleSplitView::Observer {
+                    public TabContentsContainer::ReservedAreaDelegate {
  public:
   // The browser view's class name.
   static const char kViewClassName[];
 
   // Explicitly sets how windows are shown. Use a value of -1 to give the
   // default behavior. This is used during testing and not generally useful
   // otherwise.
   static void SetShowState(int state);
 
   explicit BrowserView(Browser* browser);
@@ skipping 291 matching lines @@
   virtual views::ClientView* CreateClientView(views::Window* window);
 
   // Overridden from views::ClientView:
   virtual bool CanClose() const;
   virtual int NonClientHitTest(const gfx::Point& point);
   virtual gfx::Size GetMinimumSize();
 
   // InfoBarContainer::Delegate overrides
   virtual void InfoBarSizeChanged(bool is_animating);
 
-  // views::SingleSplitView::Observer overrides:
-  virtual bool SplitHandleMoved(views::SingleSplitView* view);
+  // TabContentsContainer::ReservedAreaDelegate overrides.
+  virtual void UpdateReservedContentsRect(const TabContentsContainer* source);
 
  protected:
   // Appends to |toolbars| a pointer to each AccessiblePaneView that
   // can be traversed using F6, in the order they should be traversed.
   // Abstracted here so that it can be extended for Chrome OS.
   virtual void GetAccessiblePanes(
       std::vector<AccessiblePaneView*>* panes);
 
   // Save the current focused view to view storage
   void SaveFocusedView();
@@ skipping 104 matching lines @@
   void UpdateAcceleratorMetrics(const views::Accelerator& accelerator,
                                 int command_id);
 
   // Invoked from TabSelectedAt or when instant is made active.  Is
   // |change_tab_contents| is true, |new_contents| is added to the view
   // hierarchy, if |change_tab_contents| is false, it's assumed |new_contents|
   // has already been added to the view hierarchy.
   void ProcessTabSelected(TabContentsWrapper* new_contents,
                           bool change_tab_contents);
 
-  // Exposes resize corner size to BrowserViewLayout.
-  gfx::Size GetResizeCornerSize() const;
-
   // Last focused view that issued a tab traversal.
   int last_focused_view_storage_id_;
 
   // The BrowserFrame that hosts this view.
   BrowserFrame* frame_;
 
   // The Browser object we are associated with.
   scoped_ptr<Browser> browser_;
 
   // BrowserView layout (LTR one is pictured here).
@@ skipping 132 matching lines @@
   UnhandledKeyboardEventHandler unhandled_keyboard_event_handler_;
 
   scoped_ptr<AccessibleViewHelper> accessible_view_helper_;
 
   NotificationRegistrar registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserView);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_