| OLD | NEW | 
|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be | 
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. | 
| 4 | 4 | 
| 5 #include "chrome/browser/ui/views/extensions/extension_popup.h" | 5 #include "chrome/browser/ui/views/extensions/extension_popup.h" | 
| 6 | 6 | 
| 7 #include "base/bind.h" | 7 #include "base/bind.h" | 
| 8 #include "chrome/browser/chrome_notification_types.h" | 8 #include "chrome/browser/chrome_notification_types.h" | 
| 9 #include "chrome/browser/devtools/devtools_window.h" | 9 #include "chrome/browser/devtools/devtools_window.h" | 
| 10 #include "chrome/browser/extensions/extension_view_host.h" | 10 #include "chrome/browser/extensions/extension_view_host.h" | 
| (...skipping 29 matching lines...) Expand all  Loading... | 
| 40 const int ExtensionPopup::kMinHeight = 25; | 40 const int ExtensionPopup::kMinHeight = 25; | 
| 41 const int ExtensionPopup::kMaxWidth = 800; | 41 const int ExtensionPopup::kMaxWidth = 800; | 
| 42 const int ExtensionPopup::kMaxHeight = 600; | 42 const int ExtensionPopup::kMaxHeight = 600; | 
| 43 | 43 | 
| 44 #if !defined(USE_AURA) | 44 #if !defined(USE_AURA) | 
| 45 // static | 45 // static | 
| 46 ExtensionPopup* ExtensionPopup::Create(extensions::ExtensionViewHost* host, | 46 ExtensionPopup* ExtensionPopup::Create(extensions::ExtensionViewHost* host, | 
| 47                                        views::View* anchor_view, | 47                                        views::View* anchor_view, | 
| 48                                        views::BubbleBorder::Arrow arrow, | 48                                        views::BubbleBorder::Arrow arrow, | 
| 49                                        ShowAction show_action) { | 49                                        ShowAction show_action) { | 
| 50   auto popup = new ExtensionPopup(host, anchor_view, arrow, show_action); | 50   auto* popup = new ExtensionPopup(host, anchor_view, arrow, show_action); | 
| 51   views::BubbleDialogDelegateView::CreateBubble(popup); | 51   views::BubbleDialogDelegateView::CreateBubble(popup); | 
| 52   return popup; | 52   return popup; | 
| 53 } | 53 } | 
| 54 #endif | 54 #endif | 
| 55 | 55 | 
| 56 ExtensionPopup::ExtensionPopup(extensions::ExtensionViewHost* host, | 56 ExtensionPopup::ExtensionPopup(extensions::ExtensionViewHost* host, | 
| 57                                views::View* anchor_view, | 57                                views::View* anchor_view, | 
| 58                                views::BubbleBorder::Arrow arrow, | 58                                views::BubbleBorder::Arrow arrow, | 
| 59                                ShowAction show_action) | 59                                ShowAction show_action) | 
| 60     : BubbleDialogDelegateView(anchor_view, arrow), | 60     : BubbleDialogDelegateView(anchor_view, arrow), | 
| (...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 197   GetWidget()->Show(); | 197   GetWidget()->Show(); | 
| 198 | 198 | 
| 199   // Focus on the host contents when the bubble is first shown. | 199   // Focus on the host contents when the bubble is first shown. | 
| 200   host()->host_contents()->Focus(); | 200   host()->host_contents()->Focus(); | 
| 201 | 201 | 
| 202   if (inspect_with_devtools_) { | 202   if (inspect_with_devtools_) { | 
| 203     DevToolsWindow::OpenDevToolsWindow( | 203     DevToolsWindow::OpenDevToolsWindow( | 
| 204         host()->host_contents(), DevToolsToggleAction::ShowConsolePanel()); | 204         host()->host_contents(), DevToolsToggleAction::ShowConsolePanel()); | 
| 205   } | 205   } | 
| 206 } | 206 } | 
| OLD | NEW | 
|---|