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

Issue 2097733002: Revert of mash: Convert TrayBackgroundView to wm common types (Closed)

Created:
4 years, 6 months ago by piman
Modified:
4 years, 6 months ago
Reviewers:
msw, stevenjb, James Cook
CC:
chromium-reviews, kalyank, sadrul, oshima+watch_chromium.org
Base URL:
https://chromium.googlesource.com/chromium/src.git@master
Target Ref:
refs/pending/heads/master
Project:
chromium
Visibility:
Public.

Description

Revert of mash: Convert TrayBackgroundView to wm common types (patchset #4 id:60001 of https://codereview.chromium.org/2091933002/ ) Reason for revert: Causing compile errors - https://build.chromium.org/p/chromium/builders/Win/builds/44650 FAILED: obj/ash/ash/web_notification_tray.obj ninja -t msvc -e environment.x86 -- C:\b\build\slave\cache\cipd\goma/gomacc.exe "C:\b\depot_tools\win_toolchain\vs_files\95ddda401ec5678f15eeed01d2bee08fcbc5ee97\VC\bin\amd64_x86/cl.exe" /nologo /showIncludes /FC @obj/ash/ash/web_notification_tray.obj.rsp /c ../../ash/system/web_notification/web_notification_tray.cc /Foobj/ash/ash/web_notification_tray.obj /Fd"obj/ash/ash_cc.pdb" c:\b\build\slave\win\build\src\ash\system\web_notification\web_notification_tray.cc(510): error C3861: 'status_area_widget': identifier not found c:\b\build\slave\win\build\src\ash\system\web_notification\web_notification_tray.cc(510): error C2227: left of '->system_tray' must point to class/struct/union/generic type c:\b\build\slave\win\build\src\ash\system\web_notification\web_notification_tray.cc(510): note: type is 'unknown-type' c:\b\build\slave\win\build\src\ash\system\web_notification\web_notification_tray.cc(510): error C2227: left of '->SetNextFocusableView' must point to class/struct/union/generic type Original issue's description: > mash: Convert TrayBackgroundView to wm common types > > Also convert StatusAreaWidget usage to WmShelf. This is closer to the long- > term pattern we want, where StatusAreaWidget is accessed via wm types. > > * Eliminate the TrayBackgroundView::status_area_widget() accessors > * Cache a copy of StatusAreaWidget* in subclasses where needed > > Move the following interdependent files: > move_source_file.py ash/system/tray/tray_background_view.* ash/common/system/tray/ > move_source_file.py ash/system/tray/tray_bubble_wrapper.* ash/common/system/tray/ > move_source_file.py ash/system/tray/tray_event_filter.* ash/common/system/tray/ > move_source_file.py ash/system/tray/system_tray_bubble.* ash/common/system/tray/ > > BUG=619636 > TEST=ash_unittests > TBR=stevenjb@chromium.org for 1 line rename in c/b/ui/chromeos/ > > Committed: https://crrev.com/f6f6340048f0ec9535c310d16dd515133fb04c50 > Cr-Commit-Position: refs/heads/master@{#401769} TBR=msw@chromium.org,stevenjb@chromium.org,jamescook@chromium.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=619636 Committed: https://crrev.com/3c51f5db7293b1e6100d44e71497428cde6d520a Cr-Commit-Position: refs/heads/master@{#401792}

Patch Set 1 #

Unified diffs Side-by-side diffs Delta from patch set Stats (+1430 lines, -1425 lines) Patch
M ash/ash.gyp View 2 chunks +8 lines, -8 lines 0 comments Download
D ash/common/system/tray/system_tray_bubble.h View 1 chunk +0 lines, -78 lines 0 comments Download
D ash/common/system/tray/system_tray_bubble.cc View 1 chunk +0 lines, -325 lines 0 comments Download
D ash/common/system/tray/tray_background_view.h View 1 chunk +0 lines, -178 lines 0 comments Download
D ash/common/system/tray/tray_background_view.cc View 1 chunk +0 lines, -521 lines 0 comments Download
D ash/common/system/tray/tray_bubble_wrapper.h View 1 chunk +0 lines, -47 lines 0 comments Download
D ash/common/system/tray/tray_bubble_wrapper.cc View 1 chunk +0 lines, -58 lines 0 comments Download
D ash/common/system/tray/tray_event_filter.h View 1 chunk +0 lines, -53 lines 0 comments Download
D ash/common/system/tray/tray_event_filter.cc View 1 chunk +0 lines, -101 lines 0 comments Download
M ash/shelf/overflow_bubble.cc View 1 chunk +1 line, -1 line 0 comments Download
M ash/system/chromeos/network/tray_sms.cc View 2 chunks +1 line, -1 line 0 comments Download
M ash/system/chromeos/session/logout_button_tray.h View 1 chunk +1 line, -1 line 0 comments Download
M ash/system/chromeos/session/logout_button_tray.cc View 1 chunk +1 line, -1 line 0 comments Download
M ash/system/chromeos/virtual_keyboard/virtual_keyboard_tray.h View 1 chunk +1 line, -1 line 0 comments Download
M ash/system/chromeos/virtual_keyboard/virtual_keyboard_tray.cc View 1 chunk +2 lines, -1 line 0 comments Download
M ash/system/overview/overview_button_tray.h View 2 chunks +1 line, -3 lines 0 comments Download
M ash/system/overview/overview_button_tray.cc View 2 chunks +1 line, -2 lines 0 comments Download
M ash/system/tray/media_security/multi_profile_media_tray_item_unittest.cc View 2 chunks +7 lines, -7 lines 0 comments Download
M ash/system/tray/system_tray.h View 3 chunks +3 lines, -6 lines 0 comments Download
M ash/system/tray/system_tray.cc View 7 chunks +5 lines, -7 lines 0 comments Download
A ash/system/tray/system_tray_bubble.h View 1 chunk +78 lines, -0 lines 0 comments Download
A ash/system/tray/system_tray_bubble.cc View 1 chunk +326 lines, -0 lines 0 comments Download
M ash/system/tray/system_tray_unittest.cc View 2 chunks +2 lines, -3 lines 0 comments Download
A ash/system/tray/tray_background_view.h View 1 chunk +186 lines, -0 lines 0 comments Download
A ash/system/tray/tray_background_view.cc View 1 chunk +530 lines, -0 lines 0 comments Download
A ash/system/tray/tray_bubble_wrapper.h View 1 chunk +47 lines, -0 lines 0 comments Download
A ash/system/tray/tray_bubble_wrapper.cc View 1 chunk +58 lines, -0 lines 0 comments Download
A ash/system/tray/tray_event_filter.h View 1 chunk +53 lines, -0 lines 0 comments Download
A ash/system/tray/tray_event_filter.cc View 1 chunk +101 lines, -0 lines 0 comments Download
M ash/system/web_notification/web_notification_tray.h View 2 chunks +1 line, -2 lines 0 comments Download
M ash/system/web_notification/web_notification_tray.cc View 8 chunks +15 lines, -19 lines 0 comments Download
M chrome/browser/chromeos/ui/focus_ring_controller.cc View 1 chunk +1 line, -1 line 0 comments Download

Messages

Total messages: 7 (3 generated)
piman
Created Revert of mash: Convert TrayBackgroundView to wm common types
4 years, 6 months ago (2016-06-24 02:32:22 UTC) #2
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/2097733002/1
4 years, 6 months ago (2016-06-24 02:32:50 UTC) #3
commit-bot: I haz the power
Committed patchset #1 (id:1)
4 years, 6 months ago (2016-06-24 02:33:56 UTC) #5
commit-bot: I haz the power
4 years, 6 months ago (2016-06-24 02:35:37 UTC) #7
Message was sent while issue was closed.
Patchset 1 (id:??) landed as
https://crrev.com/3c51f5db7293b1e6100d44e71497428cde6d520a
Cr-Commit-Position: refs/heads/master@{#401792}

Powered by Google App Engine
This is Rietveld 408576698