chrome/browser/ui/views/ash/app_list/search_builder.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/views/ash/app_list/search_builder.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/views/ash/app_list/extension_app_item.cc ('k') | chrome/browser/ui/views/ash/launcher/launcher_favicon_loader_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/ash/app_list/search_builder.cc

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

--- chrome/browser/ui/views/ash/app_list/search_builder.cc (revision 145001)

+++ chrome/browser/ui/views/ash/app_list/search_builder.cc (working copy)

@@ -18,6 +18,7 @@

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

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

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

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

#include "chrome/browser/ui/views/ash/extension_utils.h"

#include "chrome/common/extensions/extension.h"

#include "chrome/common/extensions/extension_icon_set.h"

@@ -242,8 +243,8 @@

if (disposition == CURRENT_TAB) {

// If current tab is not NTP, change disposition to NEW_FOREGROUND_TAB.

- const GURL& url = browser->GetActiveWebContents() ?

- browser->GetActiveWebContents()->GetURL() : GURL();

+ const GURL& url = chrome::GetActiveWebContents(browser) ?

+ chrome::GetActiveWebContents(browser)->GetURL() : GURL();

if (!url.SchemeIs(chrome::kChromeUIScheme) ||

url.host() != chrome::kChromeUINewTabHost) {

disposition = NEW_FOREGROUND_TAB;