Re-factor location bar/toolbar code to get rid of the browser dependency.

chrome/browser/ui/browser_tab_contents_wrapper_container.h

Index: chrome/browser/ui/browser_tab_contents_wrapper_container.h
diff --git a/chrome/browser/ui/browser_tab_contents_wrapper_container.h b/chrome/browser/ui/browser_tab_contents_wrapper_container.h
new file mode 100644
index 0000000000000000000000000000000000000000..9fda365145a5f5ca4ad475d745502d28af132a28
--- /dev/null
+++ b/chrome/browser/ui/browser_tab_contents_wrapper_container.h
@@ -0,0 +1,38 @@
+// 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_BROWSER_TAB_CONTENTS_WRAPPER_CONTAINER_H_
+#define CHROME_BROWSER_UI_BROWSER_TAB_CONTENTS_WRAPPER_CONTAINER_H_
+#pragma once
+
+#include "base/basictypes.h"
+#include "base/compiler_specific.h"
+#include "chrome/browser/ui/tab_contents/tab_contents_wrapper_container.h"
+
+class Browser;
+
+// Implementation of TabContentsWrapperContainer which uses an instance of
+// Browser in order to fulfil its duties.
+class BrowserTabContentsWrapperContainer : public TabContentsWrapperContainer {
+ public:
+  explicit BrowserTabContentsWrapperContainer(Browser* browser);
+  virtual ~BrowserTabContentsWrapperContainer();
+
+  // TabContentsWrapperContainer implementation:
+  virtual int TabCount() const OVERRIDE;
+  virtual int ActiveIndex() const OVERRIDE;
+  virtual int GetIndexOfController(
+      const content::NavigationController* controller) const OVERRIDE;
+  virtual TabContentsWrapper* GetActiveTabContentsWrapper() const OVERRIDE;
+  virtual content::WebContents* GetActiveWebContents() const OVERRIDE;
+  virtual TabContentsWrapper* GetTabContentsWrapperAt(int index) const OVERRIDE;
+  virtual content::WebContents* GetWebContentsAt(int index) const OVERRIDE;
+
+ private:
+  Browser* browser_;
+
+  DISALLOW_COPY_AND_ASSIGN(BrowserTabContentsWrapperContainer);
+};
+
+#endif  // CHROME_BROWSER_UI_BROWSER_TAB_CONTENTS_WRAPPER_CONTAINER_H_