summaryrefslogtreecommitdiffstats
path: root/chrome/browser/ui
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/ui')
-rw-r--r--chrome/browser/ui/browser.cc2
-rw-r--r--chrome/browser/ui/browser_browsertest.cc26
-rw-r--r--chrome/browser/ui/browser_list.cc5
-rw-r--r--chrome/browser/ui/cocoa/hung_renderer_controller.mm2
-rw-r--r--chrome/browser/ui/gtk/hung_renderer_dialog_gtk.cc2
-rw-r--r--chrome/browser/ui/tab_contents/tab_contents_wrapper.cc2
-rw-r--r--chrome/browser/ui/views/hung_renderer_view.cc6
-rw-r--r--chrome/browser/ui/views/tab_contents/tab_contents_view_views.cc2
-rw-r--r--chrome/browser/ui/webui/media/media_internals_proxy.cc7
-rw-r--r--chrome/browser/ui/webui/ntp/new_tab_ui_browsertest.cc2
-rw-r--r--chrome/browser/ui/webui/options/extension_settings_handler.cc6
11 files changed, 35 insertions, 27 deletions
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
index ea340c7..4c52ac1 100644
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -2506,7 +2506,7 @@ void Browser::EnumerateDirectoryHelper(TabContents* tab, int request_id,
const FilePath& path) {
ChildProcessSecurityPolicy* policy =
ChildProcessSecurityPolicy::GetInstance();
- if (!policy->CanReadDirectory(tab->render_view_host()->process()->id(),
+ if (!policy->CanReadDirectory(tab->render_view_host()->process()->GetID(),
path)) {
return;
}
diff --git a/chrome/browser/ui/browser_browsertest.cc b/chrome/browser/ui/browser_browsertest.cc
index 135c0c2..c2d035e 100644
--- a/chrome/browser/ui/browser_browsertest.cc
+++ b/chrome/browser/ui/browser_browsertest.cc
@@ -39,7 +39,7 @@
#include "chrome/common/url_constants.h"
#include "chrome/test/base/in_process_browser_test.h"
#include "chrome/test/base/ui_test_utils.h"
-#include "content/browser/renderer_host/render_process_host.h"
+#include "content/browser/renderer_host/render_process_host_impl.h"
#include "content/browser/renderer_host/render_view_host.h"
#include "content/browser/tab_contents/tab_contents.h"
#include "content/public/browser/notification_service.h"
@@ -98,7 +98,8 @@ std::wstring WindowCaptionFromPageTitle(std::wstring page_title) {
// Returns the number of active RenderProcessHosts.
int CountRenderProcessHosts() {
int result = 0;
- for (RenderProcessHost::iterator i(RenderProcessHost::AllHostsIterator());
+ for (content::RenderProcessHost::iterator i(
+ content::RenderProcessHost::AllHostsIterator());
!i.IsAtEnd(); i.Advance())
++result;
return result;
@@ -371,7 +372,7 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, NullOpenerRedirectForksProcess) {
// Start with an http URL.
ui_test_utils::NavigateToURL(browser(), http_url);
TabContents* oldtab = browser()->GetSelectedTabContents();
- RenderProcessHost* process = oldtab->render_view_host()->process();
+ content::RenderProcessHost* process = oldtab->render_view_host()->process();
// Now open a tab to a blank page, set its opener to null, and redirect it
// cross-site.
@@ -402,7 +403,8 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, NullOpenerRedirectForksProcess) {
newtab->controller().GetLastCommittedEntry()->url().spec());
// Popup window should not be in the opener's process.
- RenderProcessHost* popup_process = newtab->render_view_host()->process();
+ content::RenderProcessHost* popup_process =
+ newtab->render_view_host()->process();
EXPECT_NE(process, popup_process);
// Now open a tab to a blank page, set its opener to null, and use a
@@ -435,7 +437,8 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, NullOpenerRedirectForksProcess) {
newtab2->controller().GetLastCommittedEntry()->url().spec());
// This popup window should also not be in the opener's process.
- RenderProcessHost* popup_process2 = newtab2->render_view_host()->process();
+ content::RenderProcessHost* popup_process2 =
+ newtab2->render_view_host()->process();
EXPECT_NE(process, popup_process2);
}
@@ -457,7 +460,7 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, OtherRedirectsDontForkProcess) {
// Start with an http URL.
ui_test_utils::NavigateToURL(browser(), http_url);
TabContents* oldtab = browser()->GetSelectedTabContents();
- RenderProcessHost* process = oldtab->render_view_host()->process();
+ content::RenderProcessHost* process = oldtab->render_view_host()->process();
// Now open a tab to a blank page, set its opener to null, and redirect it
// cross-site.
@@ -487,7 +490,8 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, OtherRedirectsDontForkProcess) {
newtab->controller().GetLastCommittedEntry()->url().spec());
// Popup window should still be in the opener's process.
- RenderProcessHost* popup_process = newtab->render_view_host()->process();
+ content::RenderProcessHost* popup_process =
+ newtab->render_view_host()->process();
EXPECT_EQ(process, popup_process);
// Same thing if the current tab tries to navigate itself.
@@ -506,7 +510,8 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, OtherRedirectsDontForkProcess) {
oldtab->controller().GetLastCommittedEntry()->url().spec());
// Original window should still be in the original process.
- RenderProcessHost* new_process = newtab->render_view_host()->process();
+ content::RenderProcessHost* new_process =
+ newtab->render_view_host()->process();
EXPECT_EQ(process, new_process);
}
@@ -517,10 +522,11 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, RenderIdleTime) {
ui_test_utils::NavigateToURL(browser(),
ui_test_utils::GetTestUrl(FilePath(FilePath::kCurrentDirectory),
FilePath(kTitle1File)));
- RenderProcessHost::iterator it(RenderProcessHost::AllHostsIterator());
+ content::RenderProcessHost::iterator it(
+ content::RenderProcessHost::AllHostsIterator());
for (; !it.IsAtEnd(); it.Advance()) {
base::TimeDelta renderer_td =
- it.GetCurrentValue()->get_child_process_idle_time();
+ it.GetCurrentValue()->GetChildProcessIdleTime();
base::TimeDelta browser_td = base::TimeTicks::Now() - start;
EXPECT_TRUE(browser_td >= renderer_td);
}
diff --git a/chrome/browser/ui/browser_list.cc b/chrome/browser/ui/browser_list.cc
index ea4f60d..52ac775 100644
--- a/chrome/browser/ui/browser_list.cc
+++ b/chrome/browser/ui/browser_list.cc
@@ -19,10 +19,10 @@
#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
#include "chrome/common/chrome_notification_types.h"
#include "chrome/common/pref_names.h"
-#include "content/browser/renderer_host/render_process_host.h"
#include "content/browser/tab_contents/navigation_details.h"
#include "content/public/browser/notification_registrar.h"
#include "content/public/browser/notification_service.h"
+#include "content/public/browser/render_process_host.h"
#include "content/public/common/result_codes.h"
#if defined(OS_MACOSX)
@@ -72,7 +72,8 @@ class BrowserActivityObserver : public content::NotificationObserver {
// Counts the number of active RenderProcessHosts and logs them.
void LogRenderProcessHostCount() const {
int hosts_count = 0;
- for (RenderProcessHost::iterator i(RenderProcessHost::AllHostsIterator());
+ for (content::RenderProcessHost::iterator i(
+ content::RenderProcessHost::AllHostsIterator());
!i.IsAtEnd(); i.Advance())
++hosts_count;
UMA_HISTOGRAM_CUSTOM_COUNTS("MPArch.RPHCountPerLoad", hosts_count,
diff --git a/chrome/browser/ui/cocoa/hung_renderer_controller.mm b/chrome/browser/ui/cocoa/hung_renderer_controller.mm
index 0003ae1..3e5e38e 100644
--- a/chrome/browser/ui/cocoa/hung_renderer_controller.mm
+++ b/chrome/browser/ui/cocoa/hung_renderer_controller.mm
@@ -16,9 +16,9 @@
#import "chrome/browser/ui/cocoa/tab_contents/favicon_util.h"
#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
#include "chrome/common/logging_chrome.h"
-#include "content/browser/renderer_host/render_process_host.h"
#include "content/browser/renderer_host/render_view_host.h"
#include "content/browser/tab_contents/tab_contents.h"
+#include "content/public/browser/render_process_host.h"
#include "content/public/common/result_codes.h"
#include "grit/chromium_strings.h"
#include "grit/generated_resources.h"
diff --git a/chrome/browser/ui/gtk/hung_renderer_dialog_gtk.cc b/chrome/browser/ui/gtk/hung_renderer_dialog_gtk.cc
index f00a32b..b3668f4 100644
--- a/chrome/browser/ui/gtk/hung_renderer_dialog_gtk.cc
+++ b/chrome/browser/ui/gtk/hung_renderer_dialog_gtk.cc
@@ -13,9 +13,9 @@
#include "chrome/browser/ui/gtk/gtk_util.h"
#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
#include "chrome/common/logging_chrome.h"
-#include "content/browser/renderer_host/render_process_host.h"
#include "content/browser/renderer_host/render_view_host.h"
#include "content/browser/tab_contents/tab_contents.h"
+#include "content/public/browser/render_process_host.h"
#include "content/public/common/result_codes.h"
#include "grit/chromium_strings.h"
#include "grit/generated_resources.h"
diff --git a/chrome/browser/ui/tab_contents/tab_contents_wrapper.cc b/chrome/browser/ui/tab_contents/tab_contents_wrapper.cc
index b381a03..972647f 100644
--- a/chrome/browser/ui/tab_contents/tab_contents_wrapper.cc
+++ b/chrome/browser/ui/tab_contents/tab_contents_wrapper.cc
@@ -589,7 +589,7 @@ void TabContentsWrapper::RenderViewCreated(RenderViewHost* render_view_host) {
void TabContentsWrapper::DidBecomeSelected() {
WebCacheManager::GetInstance()->ObserveActivity(
- tab_contents()->GetRenderProcessHost()->id());
+ tab_contents()->GetRenderProcessHost()->GetID());
}
bool TabContentsWrapper::OnMessageReceived(const IPC::Message& message) {
diff --git a/chrome/browser/ui/views/hung_renderer_view.cc b/chrome/browser/ui/views/hung_renderer_view.cc
index 0b75aa6..c128e19 100644
--- a/chrome/browser/ui/views/hung_renderer_view.cc
+++ b/chrome/browser/ui/views/hung_renderer_view.cc
@@ -12,9 +12,9 @@
#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
#include "chrome/common/chrome_constants.h"
#include "chrome/common/logging_chrome.h"
-#include "content/browser/renderer_host/render_process_host.h"
#include "content/browser/renderer_host/render_view_host.h"
#include "content/browser/tab_contents/tab_contents.h"
+#include "content/public/browser/render_process_host.h"
#include "content/public/common/result_codes.h"
#include "grit/chromium_strings.h"
#include "grit/generated_resources.h"
@@ -61,7 +61,7 @@ class HungPagesTableModel : public views::GroupTableModel {
// Returns the first RenderProcessHost, or NULL if there aren't any
// TabContents.
- RenderProcessHost* GetRenderProcessHost();
+ content::RenderProcessHost* GetRenderProcessHost();
// Returns the first RenderViewHost, or NULL if there aren't any TabContents.
RenderViewHost* GetRenderViewHost();
@@ -124,7 +124,7 @@ HungPagesTableModel::HungPagesTableModel(Delegate* delegate)
HungPagesTableModel::~HungPagesTableModel() {
}
-RenderProcessHost* HungPagesTableModel::GetRenderProcessHost() {
+content::RenderProcessHost* HungPagesTableModel::GetRenderProcessHost() {
return tab_observers_.empty() ? NULL :
tab_observers_[0]->tab_contents()->GetRenderProcessHost();
}
diff --git a/chrome/browser/ui/views/tab_contents/tab_contents_view_views.cc b/chrome/browser/ui/views/tab_contents/tab_contents_view_views.cc
index 8ec3234..c22f9c5 100644
--- a/chrome/browser/ui/views/tab_contents/tab_contents_view_views.cc
+++ b/chrome/browser/ui/views/tab_contents/tab_contents_view_views.cc
@@ -12,13 +12,13 @@
#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
#include "chrome/browser/ui/views/tab_contents/native_tab_contents_view.h"
#include "chrome/browser/ui/views/tab_contents/render_view_context_menu_views.h"
-#include "content/browser/renderer_host/render_process_host.h"
#include "content/browser/renderer_host/render_view_host.h"
#include "content/browser/renderer_host/render_view_host_factory.h"
#include "content/browser/renderer_host/render_widget_host_view.h"
#include "content/browser/tab_contents/interstitial_page.h"
#include "content/browser/tab_contents/tab_contents.h"
#include "content/browser/tab_contents/tab_contents_delegate.h"
+#include "content/public/browser/render_process_host.h"
#include "ui/gfx/screen.h"
#include "views/focus/focus_manager.h"
#include "views/focus/view_storage.h"
diff --git a/chrome/browser/ui/webui/media/media_internals_proxy.cc b/chrome/browser/ui/webui/media/media_internals_proxy.cc
index 928a019..5ee0eeb 100644
--- a/chrome/browser/ui/webui/media/media_internals_proxy.cc
+++ b/chrome/browser/ui/webui/media/media_internals_proxy.cc
@@ -10,8 +10,8 @@
#include "chrome/browser/media/media_internals.h"
#include "chrome/browser/ui/webui/media/media_internals_handler.h"
#include "content/public/browser/notification_service.h"
-#include "content/browser/renderer_host/render_process_host.h"
#include "content/public/browser/notification_types.h"
+#include "content/public/browser/render_process_host.h"
using content::BrowserThread;
@@ -37,9 +37,10 @@ void MediaInternalsProxy::Observe(int type,
const content::NotificationDetails& details) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
DCHECK_EQ(type, content::NOTIFICATION_RENDERER_PROCESS_TERMINATED);
- RenderProcessHost* process = content::Source<RenderProcessHost>(source).ptr();
+ content::RenderProcessHost* process =
+ content::Source<content::RenderProcessHost>(source).ptr();
CallJavaScriptFunctionOnUIThread("media.onRendererTerminated",
- base::Value::CreateIntegerValue(process->id()));
+ base::Value::CreateIntegerValue(process->GetID()));
}
void MediaInternalsProxy::Attach(MediaInternalsMessageHandler* handler) {
diff --git a/chrome/browser/ui/webui/ntp/new_tab_ui_browsertest.cc b/chrome/browser/ui/webui/ntp/new_tab_ui_browsertest.cc
index 8894e6f..39571e2 100644
--- a/chrome/browser/ui/webui/ntp/new_tab_ui_browsertest.cc
+++ b/chrome/browser/ui/webui/ntp/new_tab_ui_browsertest.cc
@@ -36,7 +36,7 @@ IN_PROC_BROWSER_TEST_F(NewTabUIBrowserTest, ChromeInternalLoadsNTP) {
// doesn't cause us to kill the process. See http://crbug.com/104258.
IN_PROC_BROWSER_TEST_F(NewTabUIBrowserTest, LoadNTPInExistingProcess) {
// Set max renderers to 1 to force running out of processes.
- RenderProcessHost::SetMaxRendererProcessCountForTest(1);
+ content::RenderProcessHost::SetMaxRendererProcessCountForTest(1);
// Start server for simple page.
ASSERT_TRUE(test_server()->Start());
diff --git a/chrome/browser/ui/webui/options/extension_settings_handler.cc b/chrome/browser/ui/webui/options/extension_settings_handler.cc
index 668495f..56a4a86 100644
--- a/chrome/browser/ui/webui/options/extension_settings_handler.cc
+++ b/chrome/browser/ui/webui/options/extension_settings_handler.cc
@@ -777,9 +777,9 @@ void ExtensionSettingsHandler::GetActivePagesForExtensionProcess(
continue;
GURL url = host->delegate()->GetURL();
- RenderProcessHost* process = host->process();
+ content::RenderProcessHost* process = host->process();
result->push_back(
- ExtensionPage(url, process->id(), host->routing_id(),
- process->browser_context()->IsOffTheRecord()));
+ ExtensionPage(url, process->GetID(), host->routing_id(),
+ process->GetBrowserContext()->IsOffTheRecord()));
}
}
generated by cgit v1.1 at 2025-05-15 06:48:29 +0000