chrome/browser/extensions/api/tabs/tabs_api.cc - Issue 1376063005: Cleanup: Pull some browser keep alive functions into its own file.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/extensions/api/tabs/tabs_api.cc

Issue 1376063005: Cleanup: Pull some browser keep alive functions into its own file. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: more fixes Created 5 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« chrome/browser/devtools/devtools_sanity_browsertest.cc ('K') | « chrome/browser/devtools/devtools_sanity_browsertest.cc ('k') | chrome/browser/guest_view/app_view/chrome_app_view_guest_delegate.cc » ('j') | chrome/browser/lifetime/browser_close_manager_browsertest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 6cb9c4fe6c5d53c5720d659ab0e54717db24e821..4f2d359ac997f0e34da106d3b2a557ec23542e52 100644

--- a/chrome/browser/extensions/api/tabs/tabs_api.cc

+++ b/chrome/browser/extensions/api/tabs/tabs_api.cc

@@ -23,7 +23,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"

@@ -32,6 +31,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/browser_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"

@@ -590,7 +590,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 browser_lifetime::ScopedKeepAlive)),

extension());

AshPanelContents* ash_panel_contents = new AshPanelContents(app_window);

app_window->Init(urls[0], ash_panel_contents, create_params);