| Index: chrome/browser/ui/webui/task_manager_handler.cc
|
| ===================================================================
|
| --- chrome/browser/ui/webui/task_manager_handler.cc (revision 116011)
|
| +++ chrome/browser/ui/webui/task_manager_handler.cc (working copy)
|
| @@ -15,9 +15,10 @@
|
| #include "chrome/browser/ui/webui/web_ui_util.h"
|
| #include "chrome/common/chrome_notification_types.h"
|
| #include "content/browser/renderer_host/render_view_host.h"
|
| -#include "content/browser/tab_contents/tab_contents.h"
|
| +#include "content/browser/renderer_host/render_view_host_delegate.h"
|
| #include "content/public/browser/notification_service.h"
|
| #include "content/public/browser/notification_source.h"
|
| +#include "content/public/browser/web_contents.h"
|
| #include "third_party/skia/include/core/SkBitmap.h"
|
| #include "webkit/glue/webpreferences.h"
|
|
|
| @@ -402,7 +403,7 @@
|
| }
|
|
|
| void TaskManagerHandler::OpenAboutMemory(const ListValue* indexes) {
|
| - RenderViewHost* rvh = web_ui()->tab_contents()->GetRenderViewHost();
|
| + RenderViewHost* rvh = web_ui()->web_contents()->GetRenderViewHost();
|
| if (rvh && rvh->delegate()) {
|
| WebPreferences webkit_prefs = rvh->delegate()->GetWebkitPrefs();
|
| webkit_prefs.allow_scripts_to_close_windows = true;
|
| @@ -417,7 +418,7 @@
|
| // TaskManagerHandler, private: -----------------------------------------------
|
|
|
| bool TaskManagerHandler::is_alive() {
|
| - return web_ui()->tab_contents()->GetRenderViewHost() != NULL;
|
| + return web_ui()->web_contents()->GetRenderViewHost() != NULL;
|
| }
|
|
|
| void TaskManagerHandler::UpdateResourceGroupTable(int start, int length) {
|
|
|