chrome/browser/extensions/api/tabs/tabs_api.cc - Issue 557833007: Remove Increment/DecrementKeepAliveCount from AppsClient

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 557833007: Remove Increment/DecrementKeepAliveCount from AppsClient (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Pass ScopedKeepAlive Created 6 years, 3 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/apps/scoped_keep_alive.h ('K') | « chrome/browser/apps/scoped_keep_alive.cc ('k') | chrome/browser/power/process_power_collector_unittest.cc » ('j') | chrome/browser/ui/apps/chrome_app_delegate.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 2f2ce6c6ecde8687bb4e358f296f0d939280c5d9..9343ee08d02e1da68c2315bc8462fe6f17fd7082 100644

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

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

@@ -19,6 +19,7 @@

#include "base/strings/string_number_conversions.h"

#include "base/strings/string_util.h"

#include "base/strings/utf_string_conversions.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"

@@ -510,8 +511,10 @@ bool WindowsCreateFunction::RunSync() {

create_params.window_type = AppWindow::WINDOW_TYPE_V1_PANEL;

create_params.window_spec.bounds = window_bounds;

create_params.focused = saw_focus_key && focused;

- AppWindow* app_window =

- new AppWindow(window_profile, new ChromeAppDelegate(), extension());

+ AppWindow* app_window = new AppWindow(

+ window_profile,

+ new ChromeAppDelegate(make_scoped_ptr(new ScopedKeepAlive)),

+ extension());

AshPanelContents* ash_panel_contents = new AshPanelContents(app_window);

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

SetResult(ash_panel_contents->GetExtensionWindowController()