Migrate ExtensionPopup from BubbleDelegateView to

chrome/browser/ui/views/extensions/extension_popup.cc

 // 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.
 
 #include "chrome/browser/ui/views/extensions/extension_popup.h"
 
 #include "base/bind.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/devtools/devtools_window.h"
 #include "chrome/browser/extensions/extension_view_host.h"
@@ skipping 30 matching lines @@
 const int ExtensionPopup::kMaxWidth = 800;
 const int ExtensionPopup::kMaxHeight = 600;
 
 #if !defined(USE_AURA)
 // static
 ExtensionPopup* ExtensionPopup::Create(extensions::ExtensionViewHost* host,
                                        views::View* anchor_view,
                                        views::BubbleBorder::Arrow arrow,
                                        ShowAction show_action) {
   auto popup = new ExtensionPopup(host, anchor_view, arrow, show_action);
-  views::BubbleDelegateView::CreateBubble(popup);
+  views::BubbleDialogDelegateView::CreateBubble(popup);
   return popup;
 }
 #endif
 
 ExtensionPopup::ExtensionPopup(extensions::ExtensionViewHost* host,
                                views::View* anchor_view,
                                views::BubbleBorder::Arrow arrow,
                                ShowAction show_action)
-    : BubbleDelegateView(anchor_view, arrow),
+    : BubbleDialogDelegateView(anchor_view, arrow),
       host_(host),
       devtools_callback_(base::Bind(
           &ExtensionPopup::OnDevToolsStateChanged, base::Unretained(this))),
       widget_initialized_(false) {
   inspect_with_devtools_ = show_action == SHOW_AND_INSPECT;
   set_margins(gfx::Insets(kBubbleMargin));
   SetLayoutManager(new views::FillLayout());
   AddChildView(GetExtensionView(host));
   GetExtensionView(host)->set_container(this);
   // ExtensionPopup closes itself on very specific de-activation conditions.
   set_close_on_deactivate(false);
 
-
   // Listen for the containing view calling window.close();
   registrar_.Add(
       this,
       extensions::NOTIFICATION_EXTENSION_HOST_VIEW_SHOULD_CLOSE,
       content::Source<content::BrowserContext>(host->browser_context()));
   content::DevToolsAgentHost::AddAgentStateCallback(devtools_callback_);
 
   GetExtensionView(host)->GetBrowser()->tab_strip_model()->AddObserver(this);
 
   // If the host had somehow finished loading, then we'd miss the notification
   // and not show.  This seems to happen in single-process mode.
   if (host_->has_loaded_once()) {
     ShowBubble();
   } else {
     // Wait to show the popup until the contained host finishes loading.
     registrar_.Add(this,
                    content::NOTIFICATION_LOAD_COMPLETED_MAIN_FRAME,
                    content::Source<content::WebContents>(
                        host_->host_contents()));
   }
 }
 
 ExtensionPopup::~ExtensionPopup() {
   content::DevToolsAgentHost::RemoveAgentStateCallback(devtools_callback_);
 
   GetExtensionView(
       host_.get())->GetBrowser()->tab_strip_model()->RemoveObserver(this);
 }
 
+int ExtensionPopup::GetDialogButtons() const {
+  return ui::DIALOG_BUTTON_NONE;
+}
+
 void ExtensionPopup::Observe(int type,
                              const content::NotificationSource& source,
                              const content::NotificationDetails& details) {
   switch (type) {
     case content::NOTIFICATION_LOAD_COMPLETED_MAIN_FRAME:
       DCHECK_EQ(host()->host_contents(),
                 content::Source<content::WebContents>(source).ptr());
       // Show when the content finishes loading and its width is computed.
       ShowBubble();
       break;
@@ skipping 82 matching lines @@
   GetWidget()->Show();
 
   // Focus on the host contents when the bubble is first shown.
   host()->host_contents()->Focus();
 
   if (inspect_with_devtools_) {
     DevToolsWindow::OpenDevToolsWindow(host()->host_contents(),
                                        DevToolsToggleAction::ShowConsole());
   }
 }