diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-23 05:31:15 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-23 05:31:15 +0000 |
| commit | 299d7f1d0003d467a159fb79ba1884080a655a00 (patch) | |
| tree | 087f5e337119e9c836260bf46cfd808236157d30 /chrome/browser/task_manager | |
| parent | de030d16f66334efafdef4ddd01f715d9ebbcfe9 (diff) | |
| download | chromium_src-299d7f1d0003d467a159fb79ba1884080a655a00.zip chromium_src-299d7f1d0003d467a159fb79ba1884080a655a00.tar.gz chromium_src-299d7f1d0003d467a159fb79ba1884080a655a00.tar.bz2 | |
Get rid of the RenderViewType concept in content, since it was only used by Chrome. Store the enum value in the WebContents' property bag.
BUG=98716
Review URL: https://chromiumcodereview.appspot.com/10409088
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@138434 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/task_manager')
| -rw-r--r-- | chrome/browser/task_manager/task_manager.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/task_manager/task_manager_resource_providers.cc | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/chrome/browser/task_manager/task_manager.cc b/chrome/browser/task_manager/task_manager.cc index a41e167..424865c 100644 --- a/chrome/browser/task_manager/task_manager.cc +++ b/chrome/browser/task_manager/task_manager.cc @@ -25,9 +25,9 @@ #include "chrome/browser/task_manager/task_manager_worker_resource_provider.h" #include "chrome/browser/ui/browser_navigator.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" -#include "chrome/common/chrome_view_type.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" +#include "chrome/common/view_type.h" #include "content/public/browser/browser_child_process_host.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/render_view_host.h" diff --git a/chrome/browser/task_manager/task_manager_resource_providers.cc b/chrome/browser/task_manager/task_manager_resource_providers.cc index 472069e..1f2e46e 100644 --- a/chrome/browser/task_manager/task_manager_resource_providers.cc +++ b/chrome/browser/task_manager/task_manager_resource_providers.cc @@ -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 @@ const Extension* TaskManagerExtensionProcessResource::GetExtension() const { } 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 @@ bool TaskManagerExtensionProcessResourceProvider:: // 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); } |