1 files changed, 9 insertions, 12 deletions
diff --git a/chrome/browser/views/info_bubble.cc b/chrome/browser/views/info_bubble.cc
index d059af4..f2b9b27 100644
--- a/chrome/browser/views/info_bubble.cc
+++ b/chrome/browser/views/info_bubble.cc
@@ -14,7 +14,7 @@
 #include "chrome/common/win_util.h"
 #include "chrome/views/root_view.h"
 
-using ChromeViews::View;
+using views::View;
 
 // All sizes are in pixels.
 
@@ -67,7 +67,7 @@ static const int kMinimumAlpha = 72;
 // static
 InfoBubble* InfoBubble::Show(HWND parent_hwnd,
                              const gfx::Rect& position_relative_to,
-                             ChromeViews::View* content,
+                             views::View* content,
                              InfoBubbleDelegate* delegate) {
   InfoBubble* window = new InfoBubble();
   window->Init(parent_hwnd, position_relative_to, content);
@@ -87,7 +87,7 @@ InfoBubble::~InfoBubble() {
 
 void InfoBubble::Init(HWND parent_hwnd,
                       const gfx::Rect& position_relative_to,
-                      ChromeViews::View* content) {
+                      views::View* content) {
   if (kInfoBubbleCornerTopLeft == NULL) {
     kInfoBubbleCornerTopLeft = ResourceBundle::GetSharedInstance()
         .GetBitmapNamed(IDR_INFO_BUBBLE_CORNER_TOP_LEFT);
@@ -128,11 +128,10 @@ void InfoBubble::Init(HWND parent_hwnd,
   }
 
   // Register the Escape accelerator for closing.
-  ChromeViews::FocusManager* focus_manager =
-      ChromeViews::FocusManager::GetFocusManager(GetHWND());
-  focus_manager->RegisterAccelerator(ChromeViews::Accelerator(VK_ESCAPE,
-                                                              false, false,
-                                                              false),
+  views::FocusManager* focus_manager =
+      views::FocusManager::GetFocusManager(GetHWND());
+  focus_manager->RegisterAccelerator(views::Accelerator(VK_ESCAPE, false,
+                                                        false, false),
                                      this);
 
   fade_animation_.reset(new SlideAnimation(this));
@@ -161,8 +160,7 @@ void InfoBubble::AnimationProgressed(const Animation* animation) {
   content_view_->SchedulePaint();
 }
 
-bool InfoBubble::AcceleratorPressed(
-    const ChromeViews::Accelerator& accelerator) {
+bool InfoBubble::AcceleratorPressed(const views::Accelerator& accelerator) {
   DCHECK(accelerator.GetKeyCode() == VK_ESCAPE);
   if (!delegate_ || delegate_->CloseOnEscape()) {
     Close();
@@ -203,8 +201,7 @@ BrowserWindow* InfoBubble::GetHostingWindow() {
 
 // ContentView ----------------------------------------------------------------
 
-InfoBubble::ContentView::ContentView(ChromeViews::View* content,
-                                     InfoBubble* host)
+InfoBubble::ContentView::ContentView(views::View* content, InfoBubble* host)
     : host_(host) {
   if (UILayoutIsRightToLeft()) {
     arrow_edge_ = TOP_RIGHT;