chrome/browser/task_manager/task_manager.cc - Issue 10967003: Add desktop type context to most existing instances of FindTabbedBrowser.

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

Issue 10967003: Add desktop type context to most existing instances of FindTabbedBrowser. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Pre-review pass. Created 8 years, 2 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/profiles/profile_manager.cc ('K') | « chrome/browser/protector/settings_change_global_error.cc ('k') | chrome/browser/ui/ash/chrome_shell_delegate.cc » ('j') | chrome/browser/ui/webui/options/manage_profile_handler.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/task_manager/task_manager.cc

diff --git a/chrome/browser/task_manager/task_manager.cc b/chrome/browser/task_manager/task_manager.cc

index 9b6ee0d6e902490782a0de57af3d5eb4ff044716..30bd750f9d287b4c3f631c7f1044e6279f392e95 100644

--- a/chrome/browser/task_manager/task_manager.cc

+++ b/chrome/browser/task_manager/task_manager.cc

@@ -1242,7 +1242,7 @@ void TaskManager::ActivateProcess(int index) {

}

void TaskManager::AddResource(Resource* resource) {

- model_->AddResource(resource);

+model_->AddResource(resource);

Ben Goodger (Google) 2012/10/03 19:16:56 indent off

robertshield 2012/10/03 19:58:17 Done.

}

void TaskManager::RemoveResource(Resource* resource) {

@@ -1263,6 +1263,7 @@ TaskManager* TaskManager::GetInstance() {

}

void TaskManager::OpenAboutMemory() {

+ // TODO(robertshield): FTB - Merge MAD's TaskManager change.

Browser* browser = browser::FindOrCreateTabbedBrowser(

ProfileManager::GetDefaultProfileOrOffTheRecord());

chrome::NavigateParams params(browser, GURL(chrome::kChromeUIMemoryURL),