| 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 6577b22188773cac3b14e0da90d9058f238f969a..79b1c5ad8dac7d0faebcd3192d501a14963d8a03 100644
|
| --- a/chrome/browser/extensions/api/tabs/tabs_api.cc
|
| +++ b/chrome/browser/extensions/api/tabs/tabs_api.cc
|
| @@ -24,7 +24,6 @@
|
| #include "base/strings/stringprintf.h"
|
| #include "base/strings/utf_string_conversions.h"
|
| #include "base/thread_task_runner_handle.h"
|
| -#include "chrome/browser/apps/scoped_keep_alive.h"
|
| #include "chrome/browser/chrome_notification_types.h"
|
| #include "chrome/browser/extensions/api/tabs/tabs_constants.h"
|
| #include "chrome/browser/extensions/api/tabs/windows_util.h"
|
| @@ -33,6 +32,7 @@
|
| #include "chrome/browser/extensions/tab_helper.h"
|
| #include "chrome/browser/extensions/window_controller.h"
|
| #include "chrome/browser/extensions/window_controller_list.h"
|
| +#include "chrome/browser/lifetime/scoped_keep_alive.h"
|
| #include "chrome/browser/prefs/incognito_mode_prefs.h"
|
| #include "chrome/browser/profiles/profile.h"
|
| #include "chrome/browser/sessions/session_tab_helper.h"
|
| @@ -593,7 +593,8 @@ bool WindowsCreateFunction::RunSync() {
|
| create_params.focused = saw_focus_key && focused;
|
| AppWindow* app_window = new AppWindow(
|
| window_profile,
|
| - new ChromeAppDelegate(make_scoped_ptr(new ScopedKeepAlive)),
|
| + new ChromeAppDelegate(
|
| + make_scoped_ptr(new ScopedKeepAlive("ChromeAppDelegate"))),
|
| extension());
|
| AshPanelContents* ash_panel_contents = new AshPanelContents(app_window);
|
| app_window->Init(urls[0], ash_panel_contents, create_params);
|
|
|