Revert 84831 - The initial prototype code for the compact navigation (cnav) prototype, currently only active in windows. This is well hidden behind a flag and a context menu option.

Loosely based off oshima's original prototype patch: http://codereview.chromium.org/165272 

BUG=None
TEST=Activate the cnav prototype in about:flags. Right click a tab and select "Hide Toolbar" to go into cnav mode. Ensure that the compact location bar provides the same basic functionality as the toolbar (except browser actions).
Review URL: http://codereview.chromium.org/6913026

TBR=stevet@chromium.org
Review URL: http://codereview.chromium.org/7005004

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

1 files changed, 6 insertions, 7 deletions

diff --git a/chrome/browser/ui/views/dropdown_bar_host.h b/chrome/browser/ui/views/dropdown_bar_host.h
index 914f240d..c53f40c 100644
--- a/chrome/browser/ui/views/dropdown_bar_host.h
+++ b/chrome/browser/ui/views/dropdown_bar_host.h
@@ -15,19 +15,18 @@
 #include "views/focus/focus_manager.h"
 
 class BrowserView;
-class DropdownBarHostDelegate;
 class DropdownBarView;
 class TabContents;
 
 namespace ui {
 class SlideAnimation;
-}  // namespace ui
+}
 
 namespace views {
 class ExternalFocusTracker;
 class View;
 class Widget;
-}  // namespace views
+}
 
 ////////////////////////////////////////////////////////////////////////////////
 //
@@ -46,7 +45,8 @@ class DropdownBarHost : public views::AcceleratorTarget,
   explicit DropdownBarHost(BrowserView* browser_view);
   virtual ~DropdownBarHost();
 
-  void Init(views::View* view, DropdownBarHostDelegate* delegate);
+  // Initializes the dropdown bar host with the give view.
+  void Init(DropdownBarView* view);
 
   // Whether we are animating the position of the dropdown widget.
   bool IsAnimating() const;
@@ -101,7 +101,7 @@ class DropdownBarHost : public views::AcceleratorTarget,
 
  protected:
   // Returns the dropdown bar view.
-  views::View* view() const { return view_; }
+  DropdownBarView* view() const { return view_; }
 
   // Returns the focus tracker.
   views::ExternalFocusTracker* focus_tracker() const {
@@ -154,8 +154,7 @@ class DropdownBarHost : public views::AcceleratorTarget,
   BrowserView* browser_view_;
 
   // Our view, which is responsible for drawing the UI.
-  views::View* view_;
-  DropdownBarHostDelegate* delegate_;
+  DropdownBarView* view_;
 
   // The y position pixel offset of the widget while animating the
   // dropdown widget.