chrome/browser/extensions/api/tabs/tabs_api.cc - Issue 21344002: Move native_app_window code to apps areas

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 21344002: Move native_app_window code to apps areas (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix merge error Created 7 years, 5 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:

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 fcccd07c3b03ffe28c44d657b903787bf908ebea..cbe4a0dff980a9cac42d800d8d2a6a32c4c243fe 100644

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

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

@@ -588,7 +588,7 @@ bool WindowsCreateFunction::RunImpl() {

create_params.bounds = window_bounds;

create_params.focused = saw_focus_key && focused;

ShellWindow* shell_window = new ShellWindow(

- window_profile, new chrome::ChromeShellWindowDelegate(),

+ window_profile, new ChromeShellWindowDelegate(),

GetExtension());

AshPanelContents* ash_panel_contents = new AshPanelContents(shell_window);

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