Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add google analytics polyfill, fixes brave/brave-browser#4402 (uplift to 0.67.x) #2735

Merged
merged 1 commit into from
Jun 23, 2019

Conversation

brave-builds
Copy link
Collaborator

@brave-builds brave-builds commented Jun 19, 2019

Uplift of #2488

Approved, please ensure that before merging:

  • You have checked CI and the builds, lint, and tests all pass or are not related to your PR.
  • You have tested your change on Nightly.
  • The PR milestones match the branch they are landing to.

After you merge:

  • The associated issue milestone is set to the smallest version that the changes is landed on.

@brave-builds brave-builds self-assigned this Jun 19, 2019
@brave-builds brave-builds added this to the 0.67.x - Dev milestone Jun 19, 2019
kjozwiak
kjozwiak previously approved these changes Jun 20, 2019
Copy link
Member

@kjozwiak kjozwiak left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Uplifting into 0.67.x approved. Also went through #2488 (comment) via 0.68.64 Chromium: 75.0.3770.100. Please make sure that all the correct labels are being used and the appropriate issue is moved into the correct milestone.

@snyderp before merging, can you take a look at the Jenkins failure? Seems like it failed on:

03:33:08  FAILED: obj/brave/renderer/renderer/brave_content_renderer_client.o 

@kjozwiak kjozwiak self-requested a review June 20, 2019 04:52
@kjozwiak kjozwiak dismissed their stale review June 20, 2019 04:54

03:33:08 FAILED: obj/brave/renderer/renderer/brave_content_renderer_client.o

@bsclifton
Copy link
Member

Looks like the actual error is:

00:33:08  In file included from ../../brave/renderer/brave_content_settings_observer.cc:6:
00:33:08  In file included from ../../brave/renderer/brave_content_settings_observer.h:9:
00:33:08  ../../chrome/renderer/content_settings_observer.h:16:10: fatal error: 'chrome/common/content_settings_renderer.mojom.h' file not found
00:33:08  #include "chrome/common/content_settings_renderer.mojom.h"
00:33:08           ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
00:33:08  1 error generated.

Restarted the job...

@bsclifton
Copy link
Member

macOS had some issues - going to check this out locally and run the steps manually...

Copy link
Member

@bsclifton bsclifton left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ran all tests locally - everything looks great! 👍

@bsclifton bsclifton merged commit f12d660 into 0.67.x Jun 23, 2019
@bsclifton bsclifton deleted the pr2488_inject-ubo-google-analytics-code_0.67.x branch June 23, 2019 07:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants