Revert 37917 - Fix ChromeOS bustage.

BUG=none
TEST=none
TBR=oshima

Review URL: http://codereview.chromium.org/562028

TBR=ben@chromium.org
Review URL: http://codereview.chromium.org/561039

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

3 files changed, 9 insertions, 9 deletions

diff --git a/chrome/browser/chromeos/browser_extenders.cc b/chrome/browser/chromeos/browser_extenders.cc
index a74ff04..9525f3f 100644
--- a/chrome/browser/chromeos/browser_extenders.cc
+++ b/chrome/browser/chromeos/browser_extenders.cc
@@ -9,7 +9,7 @@
 #include "app/theme_provider.h"
 #include "base/command_line.h"
 #include "chrome/app/chrome_dll_resource.h"
-#include "chrome/browser/chromeos/browser_view.h"
+#include "chrome/browser/chromeos/chromeos_browser_view.h"
 #include "chrome/browser/chromeos/compact_location_bar_host.h"
 #include "chrome/browser/chromeos/compact_navigation_bar.h"
 #include "chrome/browser/chromeos/main_menu.h"
@@ -40,7 +40,7 @@ namespace {
 // For Browser::TYPE_POPUP type of BrowserView, see PopupExtender class below.
 class NormalExtender : public BrowserExtender {
  public:
-  explicit NormalExtender(chromeos::BrowserView* browser_view)
+  explicit NormalExtender(chromeos::ChromeosBrowserView* browser_view)
       : BrowserExtender(),
         browser_view_(browser_view) {
   }
@@ -57,7 +57,7 @@ class NormalExtender : public BrowserExtender {
   }
 
  private:
-  chromeos::BrowserView* browser_view_;
+  chromeos::ChromeosBrowserView* browser_view_;
 
   DISALLOW_COPY_AND_ASSIGN(NormalExtender);
 };
@@ -96,5 +96,5 @@ BrowserExtender* BrowserExtender::Create(BrowserView* browser_view) {
     return new PopupExtender();
   else
     return new NormalExtender(
-        static_cast<chromeos::BrowserView*>(browser_view));
+        static_cast<chromeos::ChromeosBrowserView*>(browser_view));
 }
diff --git a/chrome/browser/chromeos/browser_status_area_view.cc b/chrome/browser/chromeos/browser_status_area_view.cc
index d5f4ef0..df37da2 100755
--- a/chrome/browser/chromeos/browser_status_area_view.cc
+++ b/chrome/browser/chromeos/browser_status_area_view.cc
@@ -12,7 +12,7 @@
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_window.h"
 #include "chrome/browser/browser_theme_provider.h"
-#include "chrome/browser/chromeos/browser_view.h"
+#include "chrome/browser/chromeos/chromeos_browser_view.h"
 #include "chrome/browser/chromeos/status_area_button.h"
 #include "chrome/browser/chromeos/status_area_view.h"
 #include "chrome/browser/profile.h"
@@ -88,7 +88,7 @@ class OptionsMenuModel : public menus::SimpleMenuModel,
   DISALLOW_COPY_AND_ASSIGN(OptionsMenuModel);
 };
 
-BrowserStatusAreaView::BrowserStatusAreaView(BrowserView* browser_view)
+BrowserStatusAreaView::BrowserStatusAreaView(ChromeosBrowserView* browser_view)
     : StatusAreaView(browser_view),
       browser_view_(browser_view),
       menu_view_(NULL) {
diff --git a/chrome/browser/chromeos/browser_status_area_view.h b/chrome/browser/chromeos/browser_status_area_view.h
index 506630f..8220abe 100644
--- a/chrome/browser/chromeos/browser_status_area_view.h
+++ b/chrome/browser/chromeos/browser_status_area_view.h
@@ -16,7 +16,7 @@ class AppMenuModel;
 
 namespace chromeos {
 
-class BrowserView;
+class ChromeosBrowserView;
 class StatusAreaButton;
 
 // StatusAreView specialization specific for Chrome browser.
@@ -25,7 +25,7 @@ class BrowserStatusAreaView : public StatusAreaView,
                               public menus::SimpleMenuModel::Delegate,
                               public views::ViewMenuDelegate {
  public:
-  explicit BrowserStatusAreaView(BrowserView* browser_view);
+  explicit BrowserStatusAreaView(ChromeosBrowserView* browser_view);
   virtual ~BrowserStatusAreaView() {}
 
   virtual void Init();
@@ -48,7 +48,7 @@ class BrowserStatusAreaView : public StatusAreaView,
   virtual void RunMenu(views::View* source, const gfx::Point& pt);
 
   // The browser window that owns us.
-  BrowserView* browser_view_;
+  ChromeosBrowserView* browser_view_;
 
   StatusAreaButton* menu_view_;