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

Issues Search
    My Issues | Starred     Open | Closed | All

Issue 686993002: MacViews: Rename files to avoid duplicate basename conflicts. (Closed)

Created:
6 years, 1 month ago by Andre
Modified:
6 years, 1 month ago
Reviewers:
Robert Sesek
CC:
chromium-reviews, asanka, tfarina, benjhayden+dwatch_chromium.org, mac-views-reviews_chromium.org
Base URL:
https://chromium.googlesource.com/chromium/src.git@master
Project:
chromium
Visibility:
Public.

Description

MacViews: Rename files to avoid duplicate basename conflicts. Rename files to avoid duplicate basename conflicts between Cocoa and Views files. BUG=425229 Committed: https://crrev.com/62a24d3b5662de607c1cff1fd313424f49d136f1 Cr-Commit-Position: refs/heads/master@{#301858}

Patch Set 1 #

Unified diffs Side-by-side diffs Delta from patch set Stats (+29 lines, -1246 lines) Patch
M chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm View 1 chunk +1 line, -1 line 0 comments Download
M chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm View 1 chunk +1 line, -1 line 0 comments Download
D chrome/browser/ui/cocoa/bookmarks/bookmark_bar_view.h View 1 chunk +0 lines, -61 lines 0 comments Download
D chrome/browser/ui/cocoa/bookmarks/bookmark_bar_view.mm View 1 chunk +0 lines, -287 lines 0 comments Download
A + chrome/browser/ui/cocoa/bookmarks/bookmark_bar_view_cocoa.h View 2 chunks +3 lines, -3 lines 0 comments Download
A + chrome/browser/ui/cocoa/bookmarks/bookmark_bar_view_cocoa.mm View 1 chunk +1 line, -1 line 0 comments Download
A + chrome/browser/ui/cocoa/bookmarks/bookmark_bar_view_cocoa_unittest.mm View 1 chunk +1 line, -1 line 0 comments Download
D chrome/browser/ui/cocoa/bookmarks/bookmark_bar_view_unittest.mm View 1 chunk +0 lines, -327 lines 0 comments Download
M chrome/browser/ui/cocoa/download/download_shelf_controller.mm View 1 chunk +1 line, -1 line 0 comments Download
D chrome/browser/ui/cocoa/download/download_shelf_view.h View 1 chunk +0 lines, -19 lines 0 comments Download
D chrome/browser/ui/cocoa/download/download_shelf_view.mm View 1 chunk +0 lines, -91 lines 0 comments Download
A + chrome/browser/ui/cocoa/download/download_shelf_view_cocoa.h View 2 chunks +3 lines, -3 lines 0 comments Download
A + chrome/browser/ui/cocoa/download/download_shelf_view_cocoa.mm View 1 chunk +1 line, -1 line 0 comments Download
A + chrome/browser/ui/cocoa/download/download_shelf_view_cocoa_unittest.mm View 1 chunk +1 line, -1 line 0 comments Download
D chrome/browser/ui/cocoa/download/download_shelf_view_unittest.mm View 1 chunk +0 lines, -24 lines 0 comments Download
D chrome/browser/ui/cocoa/pdf_password_dialog.mm View 1 chunk +0 lines, -141 lines 0 comments Download
A + chrome/browser/ui/cocoa/pdf_password_dialog_cocoa.mm View 0 chunks +-1 lines, --1 lines 0 comments Download
M chrome/browser/ui/cocoa/tab_contents/sad_tab_controller.mm View 1 chunk +1 line, -1 line 0 comments Download
M chrome/browser/ui/cocoa/tab_contents/sad_tab_controller_unittest.mm View 1 chunk +1 line, -1 line 0 comments Download
D chrome/browser/ui/cocoa/tab_contents/sad_tab_view.h View 1 chunk +0 lines, -41 lines 0 comments Download
D chrome/browser/ui/cocoa/tab_contents/sad_tab_view.mm View 1 chunk +0 lines, -201 lines 0 comments Download
A + chrome/browser/ui/cocoa/tab_contents/sad_tab_view_cocoa.h View 2 chunks +3 lines, -3 lines 0 comments Download
A + chrome/browser/ui/cocoa/tab_contents/sad_tab_view_cocoa.mm View 1 chunk +1 line, -1 line 0 comments Download
A + chrome/browser/ui/cocoa/tab_contents/sad_tab_view_cocoa_unittest.mm View 1 chunk +1 line, -1 line 0 comments Download
D chrome/browser/ui/cocoa/tab_contents/sad_tab_view_unittest.mm View 1 chunk +0 lines, -25 lines 0 comments Download
M chrome/chrome_browser_ui.gypi View 4 chunks +7 lines, -7 lines 0 comments Download
M chrome/chrome_tests_unit.gypi View 3 chunks +3 lines, -3 lines 0 comments Download

Messages

Total messages: 7 (2 generated)
Andre
Robert, PTAL. Renaming the remaining 4 conflicting file names.
6 years, 1 month ago (2014-10-28 22:53:28 UTC) #2
Robert Sesek
LGTM
6 years, 1 month ago (2014-10-29 15:34:10 UTC) #3
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/686993002/1
6 years, 1 month ago (2014-10-29 15:53:31 UTC) #5
commit-bot: I haz the power
Committed patchset #1 (id:1)
6 years, 1 month ago (2014-10-29 16:38:38 UTC) #6
commit-bot: I haz the power
6 years, 1 month ago (2014-10-29 16:39:30 UTC) #7
Message was sent while issue was closed. 
Patchset 1 (id:??) landed as
https://crrev.com/62a24d3b5662de607c1cff1fd313424f49d136f1
Cr-Commit-Position: refs/heads/master@{#301858}

Powered by Google App Engine
This is Rietveld 408576698