tree ddc70abd75f17ce47234d05cf6340416aee876b8
parent 7be01159c27747c0498a181301393afb237c8919
author Oscar Johansson <oscarj@opera.com> 1532333738 +0000
committer Commit Bot <commit-bot@chromium.org> 1532333738 +0000

Resolve include and define issues for jumbo (mac)

When building using jumbo, files get merged and variables,
functions and defines could end up in the same scope and
conflict. This commit solves issues with includes and defines
for the mac specific part of chrome/browser/ui.

Bug: 803406
Change-Id: I55d1f6110a6144bc7ee3037a374d3e33c36a9879
Reviewed-on: https://chromium-review.googlesource.com/1144928
Reviewed-by: Scott Violet <sky@chromium.org>
Reviewed-by: Avi Drissman <avi@chromium.org>
Commit-Queue: Oscar Johansson <oscarj@opera.com>
Cr-Commit-Position: refs/heads/master@{#577121}