Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(223)

Issue 1003323005: Fix ODR violation for ShowTaskManager() on Mac (Closed)

Created:
5 years, 9 months ago by Andre
Modified:
5 years, 9 months ago
Reviewers:
tapted, Nico
CC:
chromium-reviews
Base URL:
https://chromium.googlesource.com/chromium/src.git@master
Target Ref:
refs/pending/heads/master
Project:
chromium
Visibility:
Public.

Description

Fix ODR violation for ShowTaskManager() on Mac Both task_manager_view and task_manager_cocoa define ShowTaskManager(Browser*). http://crrev.com/987483003 mistakenly causes both to get linked when building for Mac. This patch undoes that by moving the task manager files to Cocoa and Views sources. They are no longer inside enabled_task_manager condition check, but they are still excluded from Android this way. BUG=425229 Committed: https://crrev.com/c5f30f8ca795c18e12a5c5ccac4a8c23134e3ca4 Cr-Commit-Position: refs/heads/master@{#322233}

Patch Set 1 #

Unified diffs Side-by-side diffs Delta from patch set Stats (+3 lines, -13 lines) Patch
M chrome/browser/ui/BUILD.gn View 1 chunk +0 lines, -5 lines 0 comments Download
M chrome/chrome_browser_ui.gypi View 4 chunks +3 lines, -8 lines 0 comments Download

Messages

Total messages: 11 (2 generated)
Andre
Nico, Trent, please review
5 years, 9 months ago (2015-03-25 18:24:46 UTC) #2
tapted
lgtm I'd just append "for ShowTaskManager() on Mac" to the CL subject/summary line for a ...
5 years, 9 months ago (2015-03-25 18:38:03 UTC) #3
Nico
rs-lgtm for the code, but I don't fully understand the CL description. """ Both task_manager_view ...
5 years, 9 months ago (2015-03-25 18:43:50 UTC) #4
Andre
On 2015/03/25 18:38:03, tapted (travelling) wrote: > lgtm I'd just append "for ShowTaskManager() on Mac" ...
5 years, 9 months ago (2015-03-25 20:11:57 UTC) #5
Andre
On 2015/03/25 18:43:50, Nico wrote: > rs-lgtm for the code, but I don't fully understand ...
5 years, 9 months ago (2015-03-25 20:13:31 UTC) #6
Nico
On 2015/03/25 20:13:31, Andre wrote: > On 2015/03/25 18:43:50, Nico wrote: > > rs-lgtm for ...
5 years, 9 months ago (2015-03-25 20:13:54 UTC) #8
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1003323005/1
5 years, 9 months ago (2015-03-25 20:14:03 UTC) #9
commit-bot: I haz the power
Committed patchset #1 (id:1)
5 years, 9 months ago (2015-03-25 20:50:57 UTC) #10
commit-bot: I haz the power
5 years, 9 months ago (2015-03-25 20:51:53 UTC) #11
Message was sent while issue was closed.
Patchset 1 (id:??) landed as
https://crrev.com/c5f30f8ca795c18e12a5c5ccac4a8c23134e3ca4
Cr-Commit-Position: refs/heads/master@{#322233}

Powered by Google App Engine
This is Rietveld 408576698