Commit 62222ed9 authored by Jose Dapena Paz's avatar Jose Dapena Paz Committed by Commit Bot

[jumbo] Fix chrome extensions namespace aliases

Several chrome extensions namespace aliases are declared both in
namespace extensions:: and extensions::(anonymous). This is not failing
in non-jumbo build as on each unit it is declared one time. But on jumbo
build same compilation unit includes both aliases, breaking compilation.

Bug: 746956
Change-Id: Ic2255b204a832e7079bda24afb7e8769658dc2e4
Reviewed-on: https://chromium-review.googlesource.com/1105052Reviewed-by: default avatarToni Barzic <tbarzic@chromium.org>
Commit-Queue: José Dapena Paz <jose.dapena@lge.com>
Cr-Commit-Position: refs/heads/master@{#568503}
parent b3250c0a
...@@ -44,13 +44,14 @@ ...@@ -44,13 +44,14 @@
namespace extensions { namespace extensions {
namespace tabs = api::tabs;
namespace windows = api::windows;
namespace { namespace {
namespace GetRecentlyClosed = api::sessions::GetRecentlyClosed; namespace GetRecentlyClosed = api::sessions::GetRecentlyClosed;
namespace GetDevices = api::sessions::GetDevices; namespace GetDevices = api::sessions::GetDevices;
namespace Restore = api::sessions::Restore; namespace Restore = api::sessions::Restore;
namespace tabs = api::tabs;
namespace windows = api::windows;
const char kNoRecentlyClosedSessionsError[] = const char kNoRecentlyClosedSessionsError[] =
"There are no recently closed sessions."; "There are no recently closed sessions.";
......
...@@ -35,10 +35,10 @@ using zoom::ZoomController; ...@@ -35,10 +35,10 @@ using zoom::ZoomController;
namespace extensions { namespace extensions {
namespace {
namespace tabs = api::tabs; namespace tabs = api::tabs;
namespace {
bool WillDispatchTabUpdatedEvent( bool WillDispatchTabUpdatedEvent(
WebContents* contents, WebContents* contents,
const std::set<std::string> changed_property_names, const std::set<std::string> changed_property_names,
......
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