Move bubble border under views/bubble.

This is a redo of http://codereview.chromium.org/7629009/

BUG=none
TEST=none
TBR=ben@chromium.org

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

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

3 files changed, 14 insertions, 12 deletions

diff --git a/chrome/browser/ui/views/extensions/extension_installed_bubble.cc b/chrome/browser/ui/views/extensions/extension_installed_bubble.cc
index 5e0ff1e..11258bc 100644
--- a/chrome/browser/ui/views/extensions/extension_installed_bubble.cc
+++ b/chrome/browser/ui/views/extensions/extension_installed_bubble.cc
@@ -390,7 +390,8 @@ void ExtensionInstalledBubble::ShowInternal() {
   views::View::ConvertPointToScreen(reference_view, &origin);
   gfx::Rect bounds = reference_view->bounds();
   bounds.set_origin(origin);
-  BubbleBorder::ArrowLocation arrow_location = BubbleBorder::TOP_RIGHT;
+  views::BubbleBorder::ArrowLocation arrow_location =
+      views::BubbleBorder::TOP_RIGHT;
 
   // For omnibox keyword bubbles, move the arrow to point to the left edge
   // of the omnibox, just to the right of the icon.
@@ -398,7 +399,7 @@ void ExtensionInstalledBubble::ShowInternal() {
     bounds.set_origin(
         browser_view->GetLocationBarView()->GetLocationEntryOrigin());
     bounds.set_width(0);
-    arrow_location = BubbleBorder::TOP_LEFT;
+    arrow_location = views::BubbleBorder::TOP_LEFT;
   }
 
   bubble_content_ = new InstalledBubbleContent(
diff --git a/chrome/browser/ui/views/extensions/extension_popup.cc b/chrome/browser/ui/views/extensions/extension_popup.cc
index c33cd8b..28ceec6 100644
--- a/chrome/browser/ui/views/extensions/extension_popup.cc
+++ b/chrome/browser/ui/views/extensions/extension_popup.cc
@@ -38,12 +38,13 @@ const int ExtensionPopup::kMinHeight = 25;
 const int ExtensionPopup::kMaxWidth = 800;
 const int ExtensionPopup::kMaxHeight = 600;
 
-ExtensionPopup::ExtensionPopup(ExtensionHost* host,
-                               views::Widget* frame,
-                               const gfx::Rect& relative_to,
-                               BubbleBorder::ArrowLocation arrow_location,
-                               bool inspect_with_devtools,
-                               Observer* observer)
+ExtensionPopup::ExtensionPopup(
+    ExtensionHost* host,
+    views::Widget* frame,
+    const gfx::Rect& relative_to,
+    views::BubbleBorder::ArrowLocation arrow_location,
+    bool inspect_with_devtools,
+    Observer* observer)
     : BrowserBubble(host->view(),
                     frame,
                     relative_to,
@@ -176,7 +177,7 @@ ExtensionPopup* ExtensionPopup::Show(
     const GURL& url,
     Browser* browser,
     const gfx::Rect& relative_to,
-    BubbleBorder::ArrowLocation arrow_location,
+    views::BubbleBorder::ArrowLocation arrow_location,
     bool inspect_with_devtools,
     Observer* observer) {
   ExtensionProcessManager* manager =
diff --git a/chrome/browser/ui/views/extensions/extension_popup.h b/chrome/browser/ui/views/extensions/extension_popup.h
index 7f0abc3..c374d7f 100644
--- a/chrome/browser/ui/views/extensions/extension_popup.h
+++ b/chrome/browser/ui/views/extensions/extension_popup.h
@@ -9,10 +9,10 @@
 #include "base/memory/ref_counted.h"
 #include "chrome/browser/extensions/extension_host.h"
 #include "chrome/browser/ui/views/browser_bubble.h"
-#include "chrome/browser/ui/views/bubble/bubble_border.h"
 #include "chrome/browser/ui/views/extensions/extension_view.h"
 #include "content/common/notification_observer.h"
 #include "googleurl/src/gurl.h"
+#include "views/bubble/bubble_border.h"
 
 
 class Browser;
@@ -55,7 +55,7 @@ class ExtensionPopup : public BrowserBubble,
   // finish loading in order to minimize UI flashing and resizing.
   static ExtensionPopup* Show(const GURL& url, Browser* browser,
                               const gfx::Rect& relative_to,
-                              BubbleBorder::ArrowLocation arrow_location,
+                              views::BubbleBorder::ArrowLocation arrow_location,
                               bool inspect_with_devtools,
                               Observer* observer);
 
@@ -101,7 +101,7 @@ class ExtensionPopup : public BrowserBubble,
   ExtensionPopup(ExtensionHost* host,
                  views::Widget* frame,
                  const gfx::Rect& relative_to,
-                 BubbleBorder::ArrowLocation arrow_location,
+                 views::BubbleBorder::ArrowLocation arrow_location,
                  bool inspect_with_devtools,
                  Observer* observer);