Commit c9543723 authored by Oscar Johansson's avatar Oscar Johansson Committed by Commit Bot

Rename constants to be unique (chrome/renderer)

When building using jumbo, files gets merged and
constants with the same name may end up in the
same namespace and conflict. This happens for:
chrome/renderer/chrome_content_renderer_client.cc
chrome/renderer/extensions/extension_hooks_delegate.cc
chrome/renderer/extensions/tabs_hooks_delegate.cc

This commit solves the issue by renaming the constants
to something more file specific.

Bug: 870617
Change-Id: I3ded3625b3851724362d496191c5bd25dda081f6
Reviewed-on: https://chromium-review.googlesource.com/1161803Reviewed-by: default avatarScott Violet <sky@chromium.org>
Commit-Queue: Oscar Johansson <oscarj@opera.com>
Cr-Commit-Position: refs/heads/master@{#580821}
parent 62fd25c5
......@@ -272,7 +272,7 @@ void AppendParams(
}
#endif // BUILDFLAG(ENABLE_PLUGINS)
bool IsStandaloneExtensionProcess() {
bool IsStandaloneContentExtensionProcess() {
#if !BUILDFLAG(ENABLE_EXTENSIONS)
return false;
#else
......@@ -376,7 +376,7 @@ void ChromeContentRendererClient::RenderThreadStarted() {
RenderThread* thread = RenderThread::Get();
thread->SetRendererProcessType(
IsStandaloneExtensionProcess()
IsStandaloneContentExtensionProcess()
? blink::scheduler::RendererProcessType::kExtensionRenderer
: blink::scheduler::RendererProcessType::kRenderer);
......@@ -1217,7 +1217,7 @@ void ChromeContentRendererClient::PostCompositorThreadCreated(
}
bool ChromeContentRendererClient::RunIdleHandlerWhenWidgetsHidden() {
return !IsStandaloneExtensionProcess();
return !IsStandaloneContentExtensionProcess();
}
bool ChromeContentRendererClient::AllowPopup() {
......@@ -1603,7 +1603,7 @@ void ChromeContentRendererClient::WillDestroyServiceWorkerContextOnWorkerThread(
// information. Also, the enforcement of sending and binding UDP is already done
// by chrome extension permission model.
bool ChromeContentRendererClient::ShouldEnforceWebRTCRoutingPreferences() {
return !IsStandaloneExtensionProcess();
return !IsStandaloneContentExtensionProcess();
}
GURL ChromeContentRendererClient::OverrideFlashEmbedWithHTML(const GURL& url) {
......
......@@ -27,7 +27,7 @@ namespace {
using RequestResult = APIBindingHooks::RequestResult;
constexpr char kSendRequest[] = "extension.sendRequest";
constexpr char kSendExtensionRequest[] = "extension.sendRequest";
constexpr char kGetURL[] = "extension.getURL";
constexpr char kGetBackgroundPage[] = "extension.getBackgroundPage";
constexpr char kGetViews[] = "extension.getViews";
......@@ -116,7 +116,7 @@ RequestResult ExtensionHooksDelegate::HandleRequest(
Handler handler;
base::StringPiece method;
} kHandlers[] = {
{&ExtensionHooksDelegate::HandleSendRequest, kSendRequest},
{&ExtensionHooksDelegate::HandleSendRequest, kSendExtensionRequest},
{&ExtensionHooksDelegate::HandleGetURL, kGetURL},
{&ExtensionHooksDelegate::HandleGetBackgroundPage, kGetBackgroundPage},
{&ExtensionHooksDelegate::HandleGetExtensionTabs, kGetExtensionTabs},
......@@ -136,7 +136,7 @@ RequestResult ExtensionHooksDelegate::HandleRequest(
if (!handler)
return RequestResult(RequestResult::NOT_HANDLED);
if (method_name == kSendRequest) {
if (method_name == kSendExtensionRequest) {
messaging_util::MassageSendMessageArguments(context->GetIsolate(), false,
arguments);
}
......
......@@ -25,7 +25,7 @@ using RequestResult = APIBindingHooks::RequestResult;
constexpr char kConnect[] = "tabs.connect";
constexpr char kSendMessage[] = "tabs.sendMessage";
constexpr char kSendRequest[] = "tabs.sendRequest";
constexpr char kSendTabsRequest[] = "tabs.sendRequest";
} // namespace
......@@ -49,7 +49,7 @@ RequestResult TabsHooksDelegate::HandleRequest(
base::StringPiece method;
} kHandlers[] = {
{&TabsHooksDelegate::HandleSendMessage, kSendMessage},
{&TabsHooksDelegate::HandleSendRequest, kSendRequest},
{&TabsHooksDelegate::HandleSendRequest, kSendTabsRequest},
{&TabsHooksDelegate::HandleConnect, kConnect},
};
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment