chrome/browser/ui/webui/ntp/app_launcher_handler.cc - Issue 10702029: Move tab functions off Browser into browser_tabstrip and browser_tabrestore.

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/ui/webui/ntp/app_launcher_handler.cc

Issue 10702029: Move tab functions off Browser into browser_tabstrip and browser_tabrestore. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 8 years, 6 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

« no previous file with comments | « chrome/browser/ui/webui/net_internals/net_internals_ui_browsertest.cc ('k') | chrome/browser/ui/webui/ntp/new_tab_ui_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/ntp/app_launcher_handler.cc

===================================================================

--- chrome/browser/ui/webui/ntp/app_launcher_handler.cc (revision 145001)

+++ chrome/browser/ui/webui/ntp/app_launcher_handler.cc (working copy)

@@ -29,6 +29,7 @@

#include "chrome/browser/prefs/scoped_user_pref_update.h"

#include "chrome/browser/profiles/profile.h"

#include "chrome/browser/ui/browser_finder.h"

+#include "chrome/browser/ui/browser_tabstrip.h"

#include "chrome/browser/ui/browser_window.h"

#include "chrome/browser/ui/extensions/application_launch.h"

#include "chrome/browser/ui/webui/extensions/extension_icon_source.h"

@@ -571,7 +572,7 @@

web_ui()->GetWebContents());

WebContents* old_contents = NULL;

if (browser)

- old_contents = browser->GetActiveWebContents();

+ old_contents = chrome::GetActiveWebContents(browser);

WebContents* new_contents = application_launch::OpenApplication(

profile, extension, launch_container, GURL(url),

@@ -579,7 +580,7 @@

// This will also destroy the handler, so do not perform any actions after.

if (new_contents != old_contents && browser && browser->tab_count() > 1)

- browser->CloseTabContents(old_contents);

+ chrome::CloseWebContents(browser, old_contents);

}