diff options
| author | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-06 06:35:37 +0000 |
|---|---|---|
| committer | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-06 06:35:37 +0000 |
| commit | ee162d84652bb1dc914b12621722a9a3b706978f (patch) | |
| tree | 273af9476a53d00545df00cd72c4efd85e27af4d /chrome/browser/memory_details.cc | |
| parent | 63b328fe08abc80c7202bda70c654b143895c322 (diff) | |
| download | chromium_src-ee162d84652bb1dc914b12621722a9a3b706978f.zip chromium_src-ee162d84652bb1dc914b12621722a9a3b706978f.tar.gz chromium_src-ee162d84652bb1dc914b12621722a9a3b706978f.tar.bz2 | |
Split ViewType between chrome and content
BUG=89642
TEST=still works
Review URL: http://codereview.chromium.org/8135026
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@104253 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/memory_details.cc')
| -rw-r--r-- | chrome/browser/memory_details.cc | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/chrome/browser/memory_details.cc b/chrome/browser/memory_details.cc index e228faa..8d7faf1 100644 --- a/chrome/browser/memory_details.cc +++ b/chrome/browser/memory_details.cc @@ -14,6 +14,7 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/url_constants.h" +#include "chrome/common/chrome_view_types.h" #include "content/browser/browser_child_process_host.h" #include "content/browser/browser_thread.h" #include "content/browser/renderer_host/backing_store_manager.h" @@ -163,11 +164,11 @@ void MemoryDetails::CollectChildInfoOnUIThread() { RenderViewHostDelegate* host_delegate = host->delegate(); DCHECK(host_delegate); GURL url = host_delegate->GetURL(); - ViewType::Type type = host_delegate->GetRenderViewType(); + content::ViewType::Type type = host_delegate->GetRenderViewType(); if (host->enabled_bindings() & BindingsPolicy::WEB_UI) { // TODO(erikkay) the type for devtools doesn't actually appear to // be set. - if (type == ViewType::DEV_TOOLS_UI) + if (type == content::ViewType::DEV_TOOLS_UI) process.renderer_type = ChildProcessInfo::RENDERER_DEVTOOLS; else process.renderer_type = ChildProcessInfo::RENDERER_CHROME; @@ -189,14 +190,14 @@ void MemoryDetails::CollectChildInfoOnUIThread() { ChildProcessInfo::RENDERER_UNKNOWN) { process.titles.push_back(UTF8ToUTF16(url.spec())); switch (type) { - case ViewType::BACKGROUND_CONTENTS: + case chrome::ViewType::BACKGROUND_CONTENTS: process.renderer_type = ChildProcessInfo::RENDERER_BACKGROUND_APP; break; - case ViewType::INTERSTITIAL_PAGE: + case content::ViewType::INTERSTITIAL_PAGE: process.renderer_type = ChildProcessInfo::RENDERER_INTERSTITIAL; break; - case ViewType::NOTIFICATION: + case chrome::ViewType::NOTIFICATION: process.renderer_type = ChildProcessInfo::RENDERER_NOTIFICATION; break; default: |