Index: chrome/browser/extensions/api/tabs/tabs_api.cc |
diff --git a/chrome/browser/extensions/api/tabs/tabs_api.cc b/chrome/browser/extensions/api/tabs/tabs_api.cc |
index 911ba62652ab11e13b9def1531e4c10510be0f28..1a7027e29e2874f4cc98d951e5d9bce62c32ae75 100644 |
--- a/chrome/browser/extensions/api/tabs/tabs_api.cc |
+++ b/chrome/browser/extensions/api/tabs/tabs_api.cc |
@@ -8,6 +8,7 @@ |
#include <limits> |
#include <vector> |
+#include "apps/shell_window.h" |
#include "base/base64.h" |
#include "base/bind.h" |
#include "base/command_line.h" |
@@ -34,6 +35,7 @@ |
#include "chrome/browser/prefs/incognito_mode_prefs.h" |
#include "chrome/browser/profiles/profile.h" |
#include "chrome/browser/translate/translate_tab_helper.h" |
+#include "chrome/browser/ui/apps/chrome_shell_window_delegate.h" |
#include "chrome/browser/ui/browser.h" |
#include "chrome/browser/ui/browser_commands.h" |
#include "chrome/browser/ui/browser_finder.h" |
@@ -41,7 +43,6 @@ |
#include "chrome/browser/ui/browser_navigator.h" |
#include "chrome/browser/ui/browser_tabstrip.h" |
#include "chrome/browser/ui/browser_window.h" |
-#include "chrome/browser/ui/extensions/shell_window.h" |
#include "chrome/browser/ui/host_desktop.h" |
#include "chrome/browser/ui/panels/panel_manager.h" |
#include "chrome/browser/ui/tabs/tab_strip_model.h" |
@@ -97,6 +98,7 @@ |
#include "chrome/browser/extensions/shell_window_registry.h" |
#endif |
+using apps::ShellWindow; |
using content::BrowserThread; |
using content::NavigationController; |
using content::NavigationEntry; |
@@ -585,8 +587,9 @@ bool WindowsCreateFunction::RunImpl() { |
create_params.window_type = ShellWindow::WINDOW_TYPE_V1_PANEL; |
create_params.bounds = window_bounds; |
create_params.focused = saw_focus_key && focused; |
- ShellWindow* shell_window = |
- new ShellWindow(window_profile, GetExtension()); |
+ ShellWindow* shell_window = new ShellWindow( |
+ window_profile, new chrome::ChromeShellWindowDelegate(), |
+ GetExtension()); |
AshPanelContents* ash_panel_contents = new AshPanelContents(shell_window); |
shell_window->Init(urls[0], ash_panel_contents, create_params); |
SetResult(ash_panel_contents->GetExtensionWindowController()-> |