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

Issue 1149223002: Avoid basename conflict from memory_pressure_monitor.cc (Closed)

Created:
5 years, 7 months ago by scottmg
Modified:
5 years, 7 months ago
Reviewers:
chrisha, Nico, jam, oshima
CC:
chromium-reviews, grt+watch_chromium.org, gavinp+memory_chromium.org, oshima+watch_chromium.org, wfh+watch_chromium.org, erikwright+watch_chromium.org, stevenjb+watch_chromium.org, Mr4D (OOO till 08-26), shrike
Base URL:
https://chromium.googlesource.com/chromium/src.git@master
Target Ref:
refs/pending/heads/master
Project:
chromium
Visibility:
Public.

Description

Avoid basename conflict from memory_pressure_monitor.cc This is a mechanical rename from subdirs into memory/ with _platform suffixes instead. This avoids having duplicate basenames. It would probably be better to have only memory/memory_pressure_monitor.h and then _win.cc, _mac.cc, _chromeos.cc implementations, but that's a more invasive change because of the slightly different interfaces/members. TBR=jam@chromium.org, oshima@chromium.org R=thakis@chromium.org, chrisha@chromium.org BUG=490824, gyp:384, 472772 Committed: https://crrev.com/dab3548020455128b116634d3bd5db327775c7ad Cr-Commit-Position: refs/heads/master@{#331006}

Patch Set 1 #

Patch Set 2 : gn #

Patch Set 3 : owners #

Patch Set 4 : includes #

Unified diffs Side-by-side diffs Delta from patch set Stats (+40 lines, -1493 lines) Patch
M base/BUILD.gn View 6 chunks +2 lines, -8 lines 0 comments Download
M base/base.gyp View 4 chunks +3 lines, -3 lines 0 comments Download
M base/base.gypi View 4 chunks +6 lines, -6 lines 0 comments Download
D base/chromeos/OWNERS View 1 2 1 chunk +0 lines, -3 lines 0 comments Download
D base/chromeos/memory_pressure_monitor.h View 1 chunk +0 lines, -119 lines 0 comments Download
D base/chromeos/memory_pressure_monitor.cc View 1 chunk +0 lines, -272 lines 0 comments Download
D base/chromeos/memory_pressure_monitor_unittest.cc View 1 chunk +0 lines, -165 lines 0 comments Download
D base/mac/memory_pressure_monitor.h View 1 chunk +0 lines, -63 lines 0 comments Download
D base/mac/memory_pressure_monitor.cc View 1 chunk +0 lines, -78 lines 0 comments Download
D base/mac/memory_pressure_monitor_unittest.cc View 1 chunk +0 lines, -61 lines 0 comments Download
M base/memory/BUILD.gn View 1 1 chunk +6 lines, -0 lines 0 comments Download
A base/memory/OWNERS View 1 2 1 chunk +2 lines, -0 lines 0 comments Download
A + base/memory/memory_pressure_monitor_chromeos.h View 2 chunks +3 lines, -3 lines 0 comments Download
A + base/memory/memory_pressure_monitor_chromeos.cc View 1 chunk +1 line, -1 line 0 comments Download
A + base/memory/memory_pressure_monitor_chromeos_unittest.cc View 1 chunk +2 lines, -1 line 0 comments Download
A + base/memory/memory_pressure_monitor_mac.h View 2 chunks +3 lines, -3 lines 0 comments Download
A + base/memory/memory_pressure_monitor_mac.cc View 1 chunk +1 line, -1 line 0 comments Download
A + base/memory/memory_pressure_monitor_mac_unittest.cc View 1 chunk +2 lines, -1 line 0 comments Download
A + base/memory/memory_pressure_monitor_win.h View 2 chunks +3 lines, -3 lines 0 comments Download
A + base/memory/memory_pressure_monitor_win.cc View 1 chunk +1 line, -1 line 0 comments Download
A + base/memory/memory_pressure_monitor_win_unittest.cc View 1 chunk +1 line, -1 line 0 comments Download
D base/win/memory_pressure_monitor.h View 1 chunk +0 lines, -144 lines 0 comments Download
D base/win/memory_pressure_monitor.cc View 1 chunk +0 lines, -254 lines 0 comments Download
D base/win/memory_pressure_monitor_unittest.cc View 1 chunk +0 lines, -298 lines 0 comments Download
M chromeos/chromeos_switches.h View 1 2 3 1 chunk +1 line, -1 line 0 comments Download
M content/browser/browser_main_loop.cc View 1 2 3 3 chunks +3 lines, -3 lines 0 comments Download

Messages

Total messages: 14 (2 generated)
scottmg
5 years, 7 months ago (2015-05-21 20:59:53 UTC) #1
Nico
lgtm, thanks! Should've pushed back more when this was added, sorry for causing you work ...
5 years, 7 months ago (2015-05-21 21:27:16 UTC) #2
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1149223002/60001
5 years, 7 months ago (2015-05-21 21:30:33 UTC) #5
scottmg
tbr oshima for #include change in chromeos/chromeos_switches.h tbr jam for #include change in content/browser/browser_main_loop.cc
5 years, 7 months ago (2015-05-21 21:30:40 UTC) #6
chrisha
The "probably better" solution you mention is what I plan on doing, but as you ...
5 years, 7 months ago (2015-05-21 21:35:03 UTC) #7
scottmg
On 2015/05/21 21:35:03, chrisha wrote: > The "probably better" solution you mention is what I ...
5 years, 7 months ago (2015-05-21 21:37:58 UTC) #8
commit-bot: I haz the power
Committed patchset #4 (id:60001)
5 years, 7 months ago (2015-05-21 22:14:13 UTC) #9
commit-bot: I haz the power
Patchset 4 (id:??) landed as https://crrev.com/dab3548020455128b116634d3bd5db327775c7ad Cr-Commit-Position: refs/heads/master@{#331006}
5 years, 7 months ago (2015-05-21 22:15:00 UTC) #10
grt (UTC plus 2)
On 2015/05/21 21:35:03, chrisha wrote: > The "probably better" solution you mention is what I ...
5 years, 7 months ago (2015-05-22 14:03:39 UTC) #11
jabdelmalek
I'm getting the following warnings when building with GN: ninja: warning: multiple rules generate obj/base/memory/memory.memory_pressure_monitor_win.obj. ...
5 years, 7 months ago (2015-05-22 17:11:40 UTC) #12
scottmg
On 2015/05/22 17:11:40, jabdelmalek wrote: > I'm getting the following warnings when building with GN: ...
5 years, 7 months ago (2015-05-22 19:37:41 UTC) #13
Nico
5 years, 7 months ago (2015-05-22 19:38:54 UTC) #14
Message was sent while issue was closed.
On Fri, May 22, 2015 at 12:37 PM, <scottmg@chromium.org> wrote:

> On 2015/05/22 17:11:40, jabdelmalek wrote:
>
>> I'm getting the following warnings when building with GN:
>>
>
>  ninja: warning: multiple rules generate
>> obj/base/memory/memory.memory_pressure_monitor_win.obj. builds involving
>> this
>> target will not be correct; cont
>> inuing anyway
>> ninja: Entering directory `out\Debug_gn'
>> [1/1] Regenerating ninja files
>> ninja: warning: multiple rules generate
>> obj/base/memory/memory.memory_pressure_monitor_win.obj. builds involving
>> this
>> target will not be correct; cont
>> inuing anyway
>>
>
>  Why is memory_pressure_monitor_win.cc listed twice in build.gn files?
>>
>
> Sorry, because I didn't test the GN build and that doesn't error out:
> https://codereview.chromium.org/1150233003


(it will be possible to make this an error instead of a warning soon)


>
>
> https://codereview.chromium.org/1149223002/
>

To unsubscribe from this group and stop receiving emails from it, send an email
to chromium-reviews+unsubscribe@chromium.org.

Powered by Google App Engine
This is Rietveld 408576698