chrome/browser/extensions/extension_tabs_module.cc - Issue 10391158: Moves methods for finding browsers to browser_finder.

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/extension_tabs_module.cc

Issue 10391158: Moves methods for finding browsers to browser_finder. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Include fixs Created 8 years, 7 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/extensions/extension_service.cc ('k') | chrome/browser/extensions/lazy_background_page_apitest.cc » ('j') | chrome/browser/ui/browser_finder.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/extension_tabs_module.cc

diff --git a/chrome/browser/extensions/extension_tabs_module.cc b/chrome/browser/extensions/extension_tabs_module.cc

index dc228a8ba63350b3066fbc0ed9a8a5f4ab4c6592..7f15efce20c101226b5080fa1438ef2c3deadc0b 100644

--- a/chrome/browser/extensions/extension_tabs_module.cc

+++ b/chrome/browser/extensions/extension_tabs_module.cc

@@ -33,6 +33,7 @@

#include "chrome/browser/sessions/restore_tab_helper.h"

#include "chrome/browser/translate/translate_tab_helper.h"

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

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

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

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

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

@@ -303,7 +304,7 @@ bool GetLastFocusedWindowFunction::RunImpl() {

// Note: currently this returns the last active browser. If we decide to

// include other window types (e.g. panels), we will need to add logic to

// ExtensionWindowList that mirrors the active behavior of BrowserList.

- Browser* browser = BrowserList::FindAnyBrowser(

+ Browser* browser = browser::FindAnyBrowser(

profile(), include_incognito());

if (!browser || !browser->window()) {

error_ = keys::kNoLastFocusedWindowError;

@@ -979,7 +980,7 @@ bool CreateTabFunction::RunImpl() {

// Ensure the selected browser is tabbed.

if (!browser->is_type_tabbed() && browser->IsAttemptingToCloseBrowser())

- browser = Browser::GetTabbedBrowser(profile(), include_incognito());

+ browser = browser::FindTabbedBrowser(profile(), include_incognito());

if (!browser || !browser->window())

return false;

@@ -1050,7 +1051,7 @@ bool CreateTabFunction::RunImpl() {

!GetExtension()->incognito_split_mode() &&

browser->profile()->IsOffTheRecord()) {

Profile* profile = browser->profile()->GetOriginalProfile();

- browser = BrowserList::FindTabbedBrowser(profile, false);

+ browser = browser::FindTabbedBrowser(profile, false);

if (!browser) {

browser = Browser::Create(profile);

browser->window()->Show();