Skip to content

Commit

Permalink
Rename RenderProcessObserver to RenderThreadObserver
Browse files Browse the repository at this point in the history
The class is used for observing RenderThread.

The following files were actually not using the class.
So, just removed the include (and added missing include if any).
- content/renderer/cache_storage/cache_storage_dispatcher.h
- content/renderer/media/media_stream_center.h
- content/renderer/media/webrtc/peer_connection_dependency_factory.h
- extensions/renderer/user_script_set.h

Renaming was performed using sed like the followings:

find chrome/ content/ components extensions/ \( ! -regex '.*/\..*' \) -type f -print0 | xargs -0 sed -i 's|RENDER_PROCESS_OBSERVER|RENDER_THREAD_OBSERVER|g'

BUG=none
R=jochen,nyquist,sgurun,slan

Review URL: https://codereview.chromium.org/1883073003

Cr-Commit-Position: refs/heads/master@{#387870}
  • Loading branch information
tyoshino authored and Commit bot committed Apr 18, 2016
1 parent 1343c92 commit 832a58a
Show file tree
Hide file tree
Showing 69 changed files with 297 additions and 299 deletions.
4 changes: 2 additions & 2 deletions android_webview/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -535,8 +535,8 @@ source_set("common") {
"renderer/aw_print_web_view_helper_delegate.h",
"renderer/aw_render_frame_ext.cc",
"renderer/aw_render_frame_ext.h",
"renderer/aw_render_process_observer.cc",
"renderer/aw_render_process_observer.h",
"renderer/aw_render_thread_observer.cc",
"renderer/aw_render_thread_observer.h",
"renderer/aw_render_view_ext.cc",
"renderer/aw_render_view_ext.h",
"renderer/print_render_frame_observer.cc",
Expand Down
4 changes: 2 additions & 2 deletions android_webview/android_webview.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -425,8 +425,8 @@
'renderer/aw_print_web_view_helper_delegate.h',
'renderer/aw_render_frame_ext.cc',
'renderer/aw_render_frame_ext.h',
'renderer/aw_render_process_observer.cc',
'renderer/aw_render_process_observer.h',
'renderer/aw_render_thread_observer.cc',
'renderer/aw_render_thread_observer.h',
'renderer/aw_render_view_ext.cc',
'renderer/aw_render_view_ext.h',
'renderer/print_render_frame_observer.cc',
Expand Down
4 changes: 2 additions & 2 deletions android_webview/renderer/aw_content_renderer_client.cc
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@ AwContentRendererClient::~AwContentRendererClient() {

void AwContentRendererClient::RenderThreadStarted() {
RenderThread* thread = RenderThread::Get();
aw_render_process_observer_.reset(new AwRenderProcessObserver);
thread->AddObserver(aw_render_process_observer_.get());
aw_render_thread_observer_.reset(new AwRenderThreadObserver);
thread->AddObserver(aw_render_thread_observer_.get());

visited_link_slave_.reset(new visitedlink::VisitedLinkSlave);
thread->AddObserver(visited_link_slave_.get());
Expand Down
4 changes: 2 additions & 2 deletions android_webview/renderer/aw_content_renderer_client.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

#include <stddef.h>

#include "android_webview/renderer/aw_render_process_observer.h"
#include "android_webview/renderer/aw_render_thread_observer.h"
#include "base/compiler_specific.h"

namespace visitedlink {
Expand Down Expand Up @@ -52,7 +52,7 @@ class AwContentRendererClient : public content::ContentRendererClient {
blink::WebPageVisibilityState* override_state) override;

private:
std::unique_ptr<AwRenderProcessObserver> aw_render_process_observer_;
std::unique_ptr<AwRenderThreadObserver> aw_render_thread_observer_;
std::unique_ptr<visitedlink::VisitedLinkSlave> visited_link_slave_;
const bool disable_page_visibility_;
};
Expand Down
32 changes: 0 additions & 32 deletions android_webview/renderer/aw_render_process_observer.h

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

#include "android_webview/renderer/aw_render_process_observer.h"
#include "android_webview/renderer/aw_render_thread_observer.h"

#include "android_webview/common/render_view_messages.h"
#include "ipc/ipc_message_macros.h"
Expand All @@ -11,28 +11,28 @@

namespace android_webview {

AwRenderProcessObserver::AwRenderProcessObserver() {
AwRenderThreadObserver::AwRenderThreadObserver() {
}

AwRenderProcessObserver::~AwRenderProcessObserver() {
AwRenderThreadObserver::~AwRenderThreadObserver() {
}

bool AwRenderProcessObserver::OnControlMessageReceived(
bool AwRenderThreadObserver::OnControlMessageReceived(
const IPC::Message& message) {
bool handled = true;
IPC_BEGIN_MESSAGE_MAP(AwRenderProcessObserver, message)
IPC_BEGIN_MESSAGE_MAP(AwRenderThreadObserver, message)
IPC_MESSAGE_HANDLER(AwViewMsg_ClearCache, OnClearCache)
IPC_MESSAGE_HANDLER(AwViewMsg_SetJsOnlineProperty, OnSetJsOnlineProperty)
IPC_MESSAGE_UNHANDLED(handled = false)
IPC_END_MESSAGE_MAP()
return handled;
}

void AwRenderProcessObserver::OnClearCache() {
void AwRenderThreadObserver::OnClearCache() {
blink::WebCache::clear();
}

void AwRenderProcessObserver::OnSetJsOnlineProperty(bool network_up) {
void AwRenderThreadObserver::OnSetJsOnlineProperty(bool network_up) {
blink::WebNetworkStateNotifier::setOnLine(network_up);
}

Expand Down
32 changes: 32 additions & 0 deletions android_webview/renderer/aw_render_thread_observer.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

#ifndef ANDROID_WEBVIEW_RENDERER_AW_RENDER_THREAD_OBSERVER_H_
#define ANDROID_WEBVIEW_RENDERER_AW_RENDER_THREAD_OBSERVER_H_

#include "content/public/renderer/render_thread_observer.h"

#include "base/compiler_specific.h"

namespace android_webview {

// A RenderThreadObserver implementation used for handling android_webview
// specific render-process wide IPC messages.
class AwRenderThreadObserver : public content::RenderThreadObserver {
public:
AwRenderThreadObserver();
~AwRenderThreadObserver() override;

// content::RenderThreadObserver implementation.
bool OnControlMessageReceived(const IPC::Message& message) override;

private:
void OnClearCache();
void OnSetJsOnlineProperty(bool network_up);
};

} // namespace android_webview

#endif // ANDROID_WEBVIEW_RENDERER_AW_RENDER_THREAD_OBSERVER_H_

4 changes: 2 additions & 2 deletions blimp/engine/app/blimp_content_renderer_client.cc
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#include "blimp/common/compositor/blimp_image_serialization_processor.h"
#include "blimp/engine/mojo/blob_channel.mojom.h"
#include "blimp/engine/renderer/engine_image_serialization_processor.h"
#include "components/web_cache/renderer/web_cache_render_process_observer.h"
#include "components/web_cache/renderer/web_cache_render_thread_observer.h"
#include "content/public/common/service_registry.h"
#include "content/public/renderer/render_thread.h"

Expand All @@ -30,7 +30,7 @@ BlimpContentRendererClient::BlimpContentRendererClient() {}
BlimpContentRendererClient::~BlimpContentRendererClient() {}

void BlimpContentRendererClient::RenderThreadStarted() {
web_cache_observer_.reset(new web_cache::WebCacheRenderProcessObserver());
web_cache_observer_.reset(new web_cache::WebCacheRenderThreadObserver());
image_serialization_processor_.reset(
new EngineImageSerializationProcessor(GetConnectedBlobChannel()));
}
Expand Down
4 changes: 2 additions & 2 deletions blimp/engine/app/blimp_content_renderer_client.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#include "content/public/renderer/content_renderer_client.h"

namespace web_cache {
class WebCacheRenderProcessObserver;
class WebCacheRenderThreadObserver;
}

namespace blimp {
Expand All @@ -28,7 +28,7 @@ class BlimpContentRendererClient : public content::ContentRendererClient {

private:
// This observer manages the process-global web cache.
std::unique_ptr<web_cache::WebCacheRenderProcessObserver> web_cache_observer_;
std::unique_ptr<web_cache::WebCacheRenderThreadObserver> web_cache_observer_;

// Provides the functionality to serialize images in SkPicture.
std::unique_ptr<cc::ImageSerializationProcessor>
Expand Down
4 changes: 2 additions & 2 deletions chrome/chrome_renderer.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
'renderer/chrome_content_renderer_client.h',
'renderer/chrome_render_frame_observer.cc',
'renderer/chrome_render_frame_observer.h',
'renderer/chrome_render_process_observer.cc',
'renderer/chrome_render_process_observer.h',
'renderer/chrome_render_thread_observer.cc',
'renderer/chrome_render_thread_observer.h',
'renderer/chrome_render_view_observer.cc',
'renderer/chrome_render_view_observer.h',
'renderer/content_settings_observer.cc',
Expand Down
8 changes: 4 additions & 4 deletions chrome/renderer/chrome_content_renderer_client.cc
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
#include "chrome/renderer/banners/app_banner_client.h"
#include "chrome/renderer/benchmarking_extension.h"
#include "chrome/renderer/chrome_render_frame_observer.h"
#include "chrome/renderer/chrome_render_process_observer.h"
#include "chrome/renderer/chrome_render_thread_observer.h"
#include "chrome/renderer/chrome_render_view_observer.h"
#include "chrome/renderer/content_settings_observer.h"
#include "chrome/renderer/external_extension.h"
Expand Down Expand Up @@ -77,7 +77,7 @@
#include "components/startup_metric_utils/common/startup_metric_messages.h"
#include "components/version_info/version_info.h"
#include "components/visitedlink/renderer/visitedlink_slave.h"
#include "components/web_cache/renderer/web_cache_render_process_observer.h"
#include "components/web_cache/renderer/web_cache_render_thread_observer.h"
#include "content/public/common/content_constants.h"
#include "content/public/common/content_switches.h"
#include "content/public/common/url_constants.h"
Expand Down Expand Up @@ -331,8 +331,8 @@ void ChromeContentRendererClient::RenderThreadStarted() {
thread->Send(new StartupMetricHostMsg_RecordRendererMainEntryTime(
main_entry_time_));

chrome_observer_.reset(new ChromeRenderProcessObserver());
web_cache_observer_.reset(new web_cache::WebCacheRenderProcessObserver());
chrome_observer_.reset(new ChromeRenderThreadObserver());
web_cache_observer_.reset(new web_cache::WebCacheRenderThreadObserver());

#if defined(ENABLE_EXTENSIONS)
ChromeExtensionsRendererClient::GetInstance()->RenderThreadStarted();
Expand Down
8 changes: 4 additions & 4 deletions chrome/renderer/chrome_content_renderer_client.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
#include "ipc/ipc_channel_proxy.h"
#include "v8/include/v8.h"

class ChromeRenderProcessObserver;
class ChromeRenderThreadObserver;
#if defined(ENABLE_PRINT_PREVIEW)
class ChromePDFPrintClient;
#endif
Expand Down Expand Up @@ -59,7 +59,7 @@ class VisitedLinkSlave;
}

namespace web_cache {
class WebCacheRenderProcessObserver;
class WebCacheRenderThreadObserver;
}

namespace blink {
Expand Down Expand Up @@ -196,8 +196,8 @@ class ChromeContentRendererClient : public content::ContentRendererClient {
blink::WebPluginParams* params);
#endif

std::unique_ptr<ChromeRenderProcessObserver> chrome_observer_;
std::unique_ptr<web_cache::WebCacheRenderProcessObserver> web_cache_observer_;
std::unique_ptr<ChromeRenderThreadObserver> chrome_observer_;
std::unique_ptr<web_cache::WebCacheRenderThreadObserver> web_cache_observer_;

std::unique_ptr<network_hints::PrescientNetworkingDispatcher>
prescient_networking_dispatcher_;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

#include "chrome/renderer/chrome_render_process_observer.h"
#include "chrome/renderer/chrome_render_thread_observer.h"

#include <stddef.h>

Expand Down Expand Up @@ -132,7 +132,7 @@ static const int kWaitForWorkersStatsTimeoutMS = 20;
class ResourceUsageReporterImpl : public mojom::ResourceUsageReporter {
public:
ResourceUsageReporterImpl(
base::WeakPtr<ChromeRenderProcessObserver> observer,
base::WeakPtr<ChromeRenderThreadObserver> observer,
mojo::InterfaceRequest<mojom::ResourceUsageReporter> req)
: workers_to_go_(0),
binding_(this, std::move(req)),
Expand Down Expand Up @@ -222,24 +222,24 @@ class ResourceUsageReporterImpl : public mojom::ResourceUsageReporter {
mojo::Callback<void(mojom::ResourceUsageDataPtr)> callback_;
int workers_to_go_;
mojo::StrongBinding<mojom::ResourceUsageReporter> binding_;
base::WeakPtr<ChromeRenderProcessObserver> observer_;
base::WeakPtr<ChromeRenderThreadObserver> observer_;

base::WeakPtrFactory<ResourceUsageReporterImpl> weak_factory_;

DISALLOW_COPY_AND_ASSIGN(ResourceUsageReporterImpl);
};

void CreateResourceUsageReporter(
base::WeakPtr<ChromeRenderProcessObserver> observer,
base::WeakPtr<ChromeRenderThreadObserver> observer,
mojo::InterfaceRequest<mojom::ResourceUsageReporter> request) {
new ResourceUsageReporterImpl(observer, std::move(request));
}

} // namespace

bool ChromeRenderProcessObserver::is_incognito_process_ = false;
bool ChromeRenderThreadObserver::is_incognito_process_ = false;

ChromeRenderProcessObserver::ChromeRenderProcessObserver()
ChromeRenderThreadObserver::ChromeRenderThreadObserver()
: weak_factory_(this) {
const base::CommandLine& command_line =
*base::CommandLine::ForCurrentProcess();
Expand Down Expand Up @@ -276,9 +276,9 @@ ChromeRenderProcessObserver::ChromeRenderProcessObserver()
native_scheme);
}

ChromeRenderProcessObserver::~ChromeRenderProcessObserver() {}
ChromeRenderThreadObserver::~ChromeRenderThreadObserver() {}

void ChromeRenderProcessObserver::InitFieldTrialObserving(
void ChromeRenderThreadObserver::InitFieldTrialObserving(
const base::CommandLine& command_line) {
// Set up initial set of crash dump data for field trials in this renderer.
variations::SetVariationListCrashKeys();
Expand Down Expand Up @@ -306,10 +306,10 @@ void ChromeRenderProcessObserver::InitFieldTrialObserving(
}
}

bool ChromeRenderProcessObserver::OnControlMessageReceived(
bool ChromeRenderThreadObserver::OnControlMessageReceived(
const IPC::Message& message) {
bool handled = true;
IPC_BEGIN_MESSAGE_MAP(ChromeRenderProcessObserver, message)
IPC_BEGIN_MESSAGE_MAP(ChromeRenderThreadObserver, message)
IPC_MESSAGE_HANDLER(ChromeViewMsg_SetIsIncognitoProcess,
OnSetIsIncognitoProcess)
IPC_MESSAGE_HANDLER(ChromeViewMsg_SetFieldTrialGroup, OnSetFieldTrialGroup)
Expand All @@ -320,17 +320,17 @@ bool ChromeRenderProcessObserver::OnControlMessageReceived(
return handled;
}

void ChromeRenderProcessObserver::OnSetIsIncognitoProcess(
void ChromeRenderThreadObserver::OnSetIsIncognitoProcess(
bool is_incognito_process) {
is_incognito_process_ = is_incognito_process;
}

void ChromeRenderProcessObserver::OnSetContentSettingRules(
void ChromeRenderThreadObserver::OnSetContentSettingRules(
const RendererContentSettingRules& rules) {
content_setting_rules_ = rules;
}

void ChromeRenderProcessObserver::OnSetFieldTrialGroup(
void ChromeRenderThreadObserver::OnSetFieldTrialGroup(
const std::string& field_trial_name,
const std::string& group_name,
base::ProcessId sender_pid) {
Expand Down Expand Up @@ -367,11 +367,11 @@ void ChromeRenderProcessObserver::OnSetFieldTrialGroup(
}

const RendererContentSettingRules*
ChromeRenderProcessObserver::content_setting_rules() const {
ChromeRenderThreadObserver::content_setting_rules() const {
return &content_setting_rules_;
}

void ChromeRenderProcessObserver::OnFieldTrialGroupFinalized(
void ChromeRenderThreadObserver::OnFieldTrialGroupFinalized(
const std::string& trial_name,
const std::string& group_name) {
content::RenderThread::Get()->Send(
Expand Down
Loading

0 comments on commit 832a58a

Please sign in to comment.