chrome/browser/task_manager/task_manager_resource_providers.cc - Issue 10703131: Move Instant stuff off Browser.

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_resource_providers.cc

Issue 10703131: Move Instant stuff off Browser. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 8 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/task_manager/task_manager_resource_providers.cc

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

--- chrome/browser/task_manager/task_manager_resource_providers.cc (revision 145932)

+++ chrome/browser/task_manager/task_manager_resource_providers.cc (working copy)

@@ -36,6 +36,7 @@

#include "chrome/browser/tab_contents/background_contents.h"

#include "chrome/browser/tab_contents/tab_util.h"

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

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

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

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

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

@@ -239,8 +240,9 @@

}

for (BrowserList::const_iterator i = BrowserList::begin();

i != BrowserList::end(); ++i) {

- if ((*i)->instant() &&

- (*i)->instant()->GetPreviewContents() == tab_contents_) {

+ if ((*i)->instant_controller()->instant() &&

+ (*i)->instant_controller()->instant()->GetPreviewContents() ==

+ tab_contents_) {

is_instant_preview_ = true;

break;

}

« no previous file with comments | « chrome/browser/instant/instant_browsertest.cc ('k') | chrome/browser/ui/browser.h » ('j') | no next file with comments »