chrome/browser/task_manager/task_manager_resource_providers.cc - Issue 10409088: Get rid of the RenderViewType concept in content, since it was only used by Chrome. Store the enum…

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 10409088: Get rid of the RenderViewType concept in content, since it was only used by Chrome. Store the enum… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: review comments 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

« chrome/browser/speech/chrome_speech_recognition_manager_delegate.cc ('K') | « chrome/browser/task_manager/task_manager.cc ('k') | chrome/browser/ui/cocoa/extensions/extension_view_mac.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/task_manager/task_manager_resource_providers.cc

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

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

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

@@ -37,9 +37,9 @@

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

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

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

+#include "chrome/browser/view_type_utils.h"

#include "chrome/common/chrome_notification_types.h"

#include "chrome/common/chrome_switches.h"

-#include "chrome/common/chrome_view_type.h"

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

#include "chrome/common/render_messages.h"

#include "chrome/common/url_constants.h"

@@ -49,10 +49,8 @@

#include "content/public/browser/notification_service.h"

#include "content/public/browser/render_process_host.h"

#include "content/public/browser/render_view_host.h"

-#include "content/public/browser/render_view_host_delegate.h"

#include "content/public/browser/web_contents.h"

#include "content/public/common/process_type.h"

-#include "content/public/common/view_type.h"

#include "grit/generated_resources.h"

#include "grit/theme_resources.h"

#include "grit/theme_resources_standard.h"

@@ -1208,8 +1206,10 @@

}

bool TaskManagerExtensionProcessResource::IsBackground() const {

- return render_view_host_->GetDelegate()->GetRenderViewType() ==

- chrome::VIEW_TYPE_EXTENSION_BACKGROUND_PAGE;

+ WebContents* web_contents =

+ WebContents::FromRenderViewHost(render_view_host_);

+ chrome::ViewType view_type = chrome::GetViewType(web_contents);

+ return view_type == chrome::VIEW_TYPE_EXTENSION_BACKGROUND_PAGE;

}

////////////////////////////////////////////////////////////////////////////////

@@ -1330,8 +1330,8 @@

// Don't add WebContents (those are handled by

// TaskManagerTabContentsResourceProvider) or background contents (handled

// by TaskManagerBackgroundResourceProvider).

- content::ViewType view_type =

- render_view_host->GetDelegate()->GetRenderViewType();

+ WebContents* web_contents = WebContents::FromRenderViewHost(render_view_host);

+ chrome::ViewType view_type = chrome::GetViewType(web_contents);

return (view_type != chrome::VIEW_TYPE_TAB_CONTENTS &&

view_type != chrome::VIEW_TYPE_BACKGROUND_CONTENTS);

}