Support for chrome.experimental.popup API in ExternalTabContainer views

chrome/browser/views/browser_bubble.cc

 // Copyright (c) 2009 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.
 
 #include "chrome/browser/views/browser_bubble.h"
 
 #include "app/l10n_util.h"
 #include "chrome/browser/views/frame/browser_view.h"
 #include "views/widget/root_view.h"
 #include "views/window/window.h"
 
+namespace {
+
+BrowserView* GetBrowserViewFromFrame(views::Widget* frame) {
+  BrowserView* browser_view = NULL;
+  views::Window* window = frame->GetWindow();
+  if (window) {
+    browser_view = BrowserView::GetBrowserViewForNativeWindow(
+        window->GetNativeWindow());
+    DCHECK(browser_view);
+  }
+  return browser_view;
+}
+
+}  // namespace
+
 BrowserBubble::BrowserBubble(views::View* view, views::Widget* frame,
                              const gfx::Point& origin)
     : frame_(frame),
       view_(view),
       visible_(false),
       delegate_(NULL),
       attached_(false) {
   frame_native_view_ = frame_->GetNativeView();
   gfx::Size size = view->GetPreferredSize();
   bounds_.SetRect(origin.x(), origin.y(), size.width(), size.height());
@@ skipping 10 matching lines @@
   // is a descendant of BrowserView's destructor, which leads to problems.
   // In that case, Detach doesn't need to get called anyway since BrowserView
   // will do the necessary cleanup.
 }
 
 void BrowserBubble::DetachFromBrowser() {
   DCHECK(attached_);
   if (!attached_)
     return;
   attached_ = false;
-  BrowserView* browser_view = BrowserView::GetBrowserViewForNativeWindow(
-      frame_->GetWindow()->GetNativeWindow());
+
+  BrowserView* browser_view = GetBrowserViewFromFrame(frame_);
   if (browser_view)
     browser_view->DetachBrowserBubble(this);
 }
 
 void BrowserBubble::AttachToBrowser() {
   DCHECK(!attached_);
   if (attached_)
     return;
-  BrowserView* browser_view = BrowserView::GetBrowserViewForNativeWindow(
-      frame_->GetWindow()->GetNativeWindow());
-  DCHECK(browser_view);
-  if (browser_view) {
+
+  BrowserView* browser_view = GetBrowserViewFromFrame(frame_);
+  if (browser_view)
     browser_view->AttachBrowserBubble(this);
-    attached_ = true;
-  }
+
+  attached_ = true;
 }
 
 void BrowserBubble::BrowserWindowMoved() {
   if (delegate_)
     delegate_->BubbleBrowserWindowMoved(this);
   else
     Hide();
   if (visible_)
     Reposition();
 }
@@ skipping 21 matching lines @@
   views::View::ConvertPointToScreen(frame_->GetRootView(), &top_left);
   MovePopup(top_left.x() + bounds_.x(),
             top_left.y() + bounds_.y(),
             bounds_.width(),
             bounds_.height());
 }
 
 void BrowserBubble::ResizeToView() {
   SetBounds(bounds_.x(), bounds_.y(), view_->width(), view_->height());
 }