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

Issue 2036353002: mash: Move ash/common/wm/shelf to ash/common/shelf (Closed)

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

Description

mash: Move ash/common/wm/shelf to ash/common/shelf * Collapse wm_shelf_constants.h with shelf_constants.h * Start collapsing wm_shelf_types.h with shelf_types.h. This will be done in two steps to preserve rename history. * Move the other files as-is No functional changes. BUG=615155 TEST=compiles Committed: https://crrev.com/1b474d6a05616dbb12d788430075285bf7f11810 Cr-Commit-Position: refs/heads/master@{#397907}

Patch Set 1 #

Patch Set 2 : similarity #

Patch Set 3 : similarity again #

Patch Set 4 : similarity #

Patch Set 5 : gyp #

Total comments: 2

Patch Set 6 : rebase #

Patch Set 7 : rebase again #

Unified diffs Side-by-side diffs Delta from patch set Stats (+535 lines, -831 lines) Patch
M ash/app_list/app_list_presenter_delegate.cc View 3 chunks +6 lines, -5 lines 0 comments Download
M ash/ash.gyp View 1 2 3 4 5 4 chunks +7 lines, -9 lines 0 comments Download
M ash/aura/wm_root_window_controller_aura.h View 1 2 3 4 5 1 chunk +1 line, -1 line 0 comments Download
M ash/aura/wm_root_window_controller_aura.cc View 1 2 3 4 5 1 chunk +1 line, -1 line 0 comments Download
M ash/aura/wm_shelf_aura.h View 1 2 3 4 5 4 chunks +2 lines, -5 lines 0 comments Download
M ash/aura/wm_shelf_aura.cc View 1 2 3 4 5 3 chunks +2 lines, -4 lines 0 comments Download
A + ash/common/shelf/shelf_constants.h View 2 chunks +10 lines, -7 lines 0 comments Download
A + ash/common/shelf/shelf_constants.cc View 1 chunk +3 lines, -1 line 0 comments Download
A + ash/common/shelf/shelf_types.h View 1 2 chunks +14 lines, -3 lines 0 comments Download
A + ash/common/shelf/wm_shelf.h View 1 2 3 4 5 3 chunks +5 lines, -9 lines 0 comments Download
A + ash/common/shelf/wm_shelf_observer.h View 1 2 3 4 5 2 chunks +4 lines, -9 lines 0 comments Download
A + ash/common/shelf/wm_shelf_util.h View 1 chunk +4 lines, -6 lines 0 comments Download
A + ash/common/shelf/wm_shelf_util.cc View 4 1 chunk +5 lines, -5 lines 0 comments Download
M ash/common/wm/dock/docked_window_layout_manager.h View 1 2 3 4 5 3 chunks +3 lines, -6 lines 0 comments Download
M ash/common/wm/dock/docked_window_layout_manager.cc View 1 2 3 4 5 9 chunks +20 lines, -20 lines 0 comments Download
M ash/common/wm/panels/panel_layout_manager.h View 1 2 3 4 5 6 chunks +7 lines, -7 lines 0 comments Download
M ash/common/wm/panels/panel_layout_manager.cc View 1 2 3 4 5 11 chunks +24 lines, -24 lines 0 comments Download
M ash/common/wm/panels/panel_window_resizer.cc View 1 2 3 4 5 2 chunks +5 lines, -5 lines 0 comments Download
D ash/common/wm/shelf/wm_shelf.h View 1 2 3 4 5 1 chunk +0 lines, -53 lines 0 comments Download
D ash/common/wm/shelf/wm_shelf_constants.h View 1 chunk +0 lines, -22 lines 0 comments Download
D ash/common/wm/shelf/wm_shelf_constants.cc View 1 chunk +0 lines, -14 lines 0 comments Download
D ash/common/wm/shelf/wm_shelf_observer.h View 1 2 3 4 5 1 chunk +0 lines, -33 lines 0 comments Download
D ash/common/wm/shelf/wm_shelf_types.h View 1 2 chunks +0 lines, -15 lines 0 comments Download
D ash/common/wm/shelf/wm_shelf_util.h View 1 chunk +0 lines, -20 lines 0 comments Download
D ash/common/wm/shelf/wm_shelf_util.cc View 1 chunk +0 lines, -16 lines 0 comments Download
M ash/common/wm_root_window_controller.h View 1 2 3 4 5 2 chunks +2 lines, -5 lines 0 comments Download
M ash/content/keyboard_overlay/keyboard_overlay_delegate_unittest.cc View 3 chunks +8 lines, -8 lines 0 comments Download
M ash/mus/bridge/wm_root_window_controller_mus.h View 1 2 3 4 5 1 chunk +1 line, -1 line 0 comments Download
M ash/mus/bridge/wm_root_window_controller_mus.cc View 1 2 3 4 5 1 chunk +1 line, -1 line 0 comments Download
M ash/mus/bridge/wm_shelf_mus.h View 1 2 3 4 5 2 chunks +8 lines, -8 lines 0 comments Download
M ash/mus/bridge/wm_shelf_mus.cc View 1 2 3 4 5 2 chunks +9 lines, -9 lines 0 comments Download
M ash/root_window_controller.h View 1 2 3 4 5 1 chunk +1 line, -1 line 0 comments Download
M ash/root_window_controller.cc View 1 2 3 4 5 2 chunks +1 line, -1 line 0 comments Download
M ash/shelf/app_list_button.cc View 1 chunk +3 lines, -3 lines 0 comments Download
M ash/shelf/overflow_bubble_view.cc View 2 chunks +2 lines, -3 lines 0 comments Download
M ash/shelf/overflow_button.h View 1 chunk +1 line, -1 line 0 comments Download
M ash/shelf/overflow_button.cc View 2 chunks +5 lines, -5 lines 0 comments Download
M ash/shelf/shelf.h View 1 2 3 4 5 6 5 chunks +11 lines, -14 lines 0 comments Download
M ash/shelf/shelf.cc View 1 2 3 4 5 6 4 chunks +5 lines, -5 lines 0 comments Download
M ash/shelf/shelf_alignment_menu.cc View 2 chunks +4 lines, -4 lines 0 comments Download
M ash/shelf/shelf_button.cc View 3 chunks +3 lines, -3 lines 0 comments Download
D ash/shelf/shelf_constants.h View 1 chunk +0 lines, -34 lines 0 comments Download
D ash/shelf/shelf_constants.cc View 1 chunk +0 lines, -14 lines 0 comments Download
M ash/shelf/shelf_item_types.cc View 1 chunk +1 line, -1 line 0 comments Download
M ash/shelf/shelf_layout_manager.h View 3 chunks +7 lines, -9 lines 0 comments Download
M ash/shelf/shelf_layout_manager.cc View 1 2 3 4 5 7 chunks +16 lines, -18 lines 0 comments Download
M ash/shelf/shelf_layout_manager_observer.h View 2 chunks +2 lines, -2 lines 0 comments Download
M ash/shelf/shelf_layout_manager_unittest.cc View 15 chunks +30 lines, -41 lines 0 comments Download
M ash/shelf/shelf_locking_manager.h View 3 chunks +3 lines, -5 lines 0 comments Download
M ash/shelf/shelf_locking_manager.cc View 1 chunk +4 lines, -4 lines 0 comments Download
M ash/shelf/shelf_locking_manager_unittest.cc View 1 chunk +17 lines, -17 lines 0 comments Download
M ash/shelf/shelf_navigator.h View 1 chunk +1 line, -1 line 0 comments Download
D ash/shelf/shelf_types.h View 1 chunk +0 lines, -31 lines 0 comments Download
M ash/shelf/shelf_util.h View 1 chunk +1 line, -1 line 0 comments Download
M ash/shelf/shelf_util.cc View 1 chunk +1 line, -1 line 0 comments Download
M ash/shelf/shelf_view.cc View 1 2 3 4 5 2 chunks +1 line, -1 line 0 comments Download
M ash/shelf/shelf_view_unittest.cc View 7 chunks +12 lines, -12 lines 0 comments Download
M ash/shelf/shelf_widget.h View 1 2 3 4 5 2 chunks +4 lines, -4 lines 0 comments Download
M ash/shelf/shelf_widget.cc View 1 2 3 4 5 8 chunks +20 lines, -22 lines 0 comments Download
M ash/shelf/shelf_widget_unittest.cc View 11 chunks +27 lines, -27 lines 0 comments Download
M ash/shelf/shelf_window_watcher.cc View 1 chunk +1 line, -1 line 0 comments Download
M ash/shell.h View 1 2 3 4 5 1 chunk +1 line, -1 line 0 comments Download
M ash/shell/context_menu.cc View 1 chunk +1 line, -1 line 0 comments Download
M ash/system/cast/tray_cast.h View 1 chunk +1 line, -1 line 0 comments Download
M ash/system/cast/tray_cast.cc View 4 chunks +6 lines, -6 lines 0 comments Download
M ash/system/chromeos/network/tray_network.h View 1 chunk +1 line, -1 line 0 comments Download
M ash/system/chromeos/network/tray_network.cc View 3 chunks +4 lines, -5 lines 0 comments Download
M ash/system/chromeos/network/tray_vpn.h View 1 chunk +1 line, -1 line 0 comments Download
M ash/system/chromeos/network/tray_vpn.cc View 1 chunk +1 line, -1 line 0 comments Download
M ash/system/chromeos/power/tray_power.h View 1 chunk +1 line, -1 line 0 comments Download
M ash/system/chromeos/power/tray_power.cc View 1 chunk +1 line, -1 line 0 comments Download
M ash/system/chromeos/screen_security/screen_tray_item.h View 1 chunk +1 line, -1 line 0 comments Download
M ash/system/chromeos/screen_security/screen_tray_item.cc View 2 chunks +3 lines, -4 lines 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 2 chunks +2 lines, -2 lines 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 3 chunks +4 lines, -4 lines 0 comments Download
M ash/system/date/tray_date.h View 1 chunk +1 line, -1 line 0 comments Download
M ash/system/date/tray_date.cc View 3 chunks +5 lines, -6 lines 0 comments Download
M ash/system/ime/tray_ime_chromeos.h View 1 chunk +1 line, -1 line 0 comments Download
M ash/system/ime/tray_ime_chromeos.cc View 1 chunk +1 line, -1 line 0 comments Download
M ash/system/overview/overview_button_tray.h View 1 chunk +1 line, -1 line 0 comments Download
M ash/system/overview/overview_button_tray.cc View 3 chunks +4 lines, -4 lines 0 comments Download
M ash/system/overview/overview_button_tray_unittest.cc View 1 chunk +1 line, -1 line 0 comments Download
M ash/system/status_area_widget.h View 1 2 3 4 5 2 chunks +2 lines, -2 lines 0 comments Download
M ash/system/status_area_widget.cc View 1 2 3 4 5 1 chunk +1 line, -1 line 0 comments Download
M ash/system/status_area_widget_delegate.h View 3 chunks +3 lines, -3 lines 0 comments Download
M ash/system/status_area_widget_delegate.cc View 3 chunks +3 lines, -4 lines 0 comments Download
M ash/system/toast/toast_manager_unittest.cc View 1 2 3 4 5 6 6 chunks +6 lines, -6 lines 0 comments Download
M ash/system/tray/system_tray.h View 2 chunks +2 lines, -2 lines 0 comments Download
M ash/system/tray/system_tray.cc View 5 chunks +6 lines, -6 lines 0 comments Download
M ash/system/tray/system_tray_item.h View 2 chunks +2 lines, -2 lines 0 comments Download
M ash/system/tray/system_tray_item.cc View 1 chunk +2 lines, -2 lines 0 comments Download
M ash/system/tray/system_tray_unittest.cc View 6 chunks +6 lines, -6 lines 0 comments Download
M ash/system/tray/tray_background_view.h View 6 chunks +7 lines, -7 lines 0 comments Download
M ash/system/tray/tray_background_view.cc View 8 chunks +11 lines, -12 lines 0 comments Download
M ash/system/tray/tray_image_item.h View 1 chunk +2 lines, -2 lines 0 comments Download
M ash/system/tray/tray_image_item.cc View 3 chunks +4 lines, -5 lines 0 comments Download
M ash/system/tray/tray_item_view.cc View 3 chunks +5 lines, -5 lines 0 comments Download
M ash/system/tray/tray_utils.h View 2 chunks +3 lines, -5 lines 0 comments Download
M ash/system/tray/tray_utils.cc View 3 chunks +5 lines, -7 lines 0 comments Download
M ash/system/user/tray_user.h View 1 chunk +1 line, -1 line 0 comments Download
M ash/system/user/tray_user.cc View 2 chunks +3 lines, -3 lines 0 comments Download
M ash/system/user/tray_user_separator.h View 1 chunk +1 line, -1 line 0 comments Download
M ash/system/web_notification/ash_popup_alignment_delegate.h View 2 chunks +2 lines, -2 lines 0 comments Download
M ash/system/web_notification/ash_popup_alignment_delegate.cc View 1 2 3 4 5 3 chunks +4 lines, -4 lines 0 comments Download
M ash/system/web_notification/ash_popup_alignment_delegate_unittest.cc View 1 2 3 4 5 5 chunks +6 lines, -6 lines 0 comments Download
M ash/system/web_notification/web_notification_tray.h View 1 chunk +1 line, -1 line 0 comments Download
M ash/system/web_notification/web_notification_tray.cc View 1 2 3 4 5 3 chunks +3 lines, -3 lines 0 comments Download
M ash/sysui/context_menu_mus.cc View 1 chunk +1 line, -1 line 0 comments Download
M ash/sysui/shelf_delegate_mus.cc View 1 2 3 4 5 2 chunks +2 lines, -2 lines 0 comments Download
M ash/test/shelf_view_test_api.cc View 1 chunk +1 line, -1 line 0 comments Download
M ash/wm/dock/docked_window_layout_manager_unittest.cc View 1 2 3 4 5 2 chunks +1 line, -1 line 0 comments Download
M ash/wm/dock/docked_window_resizer_unittest.cc View 1 2 3 4 5 3 chunks +4 lines, -4 lines 0 comments Download
M ash/wm/gestures/shelf_gesture_handler.cc View 1 chunk +1 line, -1 line 0 comments Download
M ash/wm/immersive_fullscreen_controller_unittest.cc View 1 chunk +1 line, -1 line 0 comments Download
M ash/wm/overview/window_selector.cc View 1 2 3 4 5 1 chunk +1 line, -1 line 0 comments Download
M ash/wm/panels/attached_panel_window_targeter.cc View 1 2 3 4 5 1 chunk +1 line, -1 line 0 comments Download
M ash/wm/panels/panel_layout_manager_unittest.cc View 1 2 3 4 5 14 chunks +19 lines, -19 lines 0 comments Download
M ash/wm/panels/panel_window_resizer_unittest.cc View 1 2 3 4 5 5 chunks +4 lines, -4 lines 0 comments Download
M ash/wm/window_animations.cc View 1 chunk +2 lines, -2 lines 0 comments Download
M ash/wm/workspace_controller_unittest.cc View 1 2 3 4 5 1 chunk +2 lines, -3 lines 0 comments Download
M chrome/browser/chromeos/first_run/steps/tray_step.cc View 1 chunk +3 lines, -4 lines 0 comments Download
M chrome/browser/ui/apps/chrome_app_delegate.cc View 1 2 3 4 5 6 1 chunk +1 line, -1 line 0 comments Download
M chrome/browser/ui/ash/chrome_launcher_prefs.h View 2 chunks +3 lines, -4 lines 0 comments Download
M chrome/browser/ui/ash/chrome_launcher_prefs.cc View 3 chunks +11 lines, -12 lines 0 comments Download
M chrome/browser/ui/ash/launcher/chrome_launcher_controller.h View 1 2 3 4 5 6 1 chunk +1 line, -1 line 0 comments Download
M chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc View 1 2 3 4 5 6 1 chunk +1 line, -1 line 0 comments Download
M chrome/browser/ui/ash/launcher/chrome_mash_shelf_controller.cc View 1 chunk +1 line, -1 line 0 comments Download
M chrome/browser/ui/ash/launcher/launcher_favicon_loader.cc View 1 chunk +1 line, -1 line 0 comments Download
M chrome/browser/ui/ash/launcher/launcher_favicon_loader_browsertest.cc View 1 chunk +1 line, -1 line 0 comments Download
M chrome/browser/ui/views/frame/immersive_mode_controller_ash_unittest.cc View 1 chunk +1 line, -1 line 0 comments Download

Messages

Total messages: 16 (8 generated)
James Cook
sky, please take a look. This is almost entirely mechanical -- move_source_file.py followed by renames ...
4 years, 6 months ago (2016-06-03 19:40:57 UTC) #3
James Cook
https://codereview.chromium.org/2036353002/diff/80001/ash/common/shelf/wm_shelf_util.cc File ash/common/shelf/wm_shelf_util.cc (right): https://codereview.chromium.org/2036353002/diff/80001/ash/common/shelf/wm_shelf_util.cc#newcode5 ash/common/shelf/wm_shelf_util.cc:5: #include "ash/common/shelf/wm_shelf_util.h" Also, reitveld is wrong about this file ...
4 years, 6 months ago (2016-06-03 19:52:09 UTC) #4
sky
LGTM
4 years, 6 months ago (2016-06-03 20:29:42 UTC) #5
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/2036353002/100001
4 years, 6 months ago (2016-06-03 23:06:33 UTC) #8
commit-bot: I haz the power
Try jobs failed on following builders: win_chromium_rel_ng on tryserver.chromium.win (JOB_FAILED, http://build.chromium.org/p/tryserver.chromium.win/builders/win_chromium_rel_ng/builds/233383)
4 years, 6 months ago (2016-06-04 00:59:41 UTC) #10
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/2036353002/120001
4 years, 6 months ago (2016-06-04 04:49:56 UTC) #13
commit-bot: I haz the power
Committed patchset #7 (id:120001)
4 years, 6 months ago (2016-06-04 05:56:17 UTC) #14
commit-bot: I haz the power
4 years, 6 months ago (2016-06-04 05:58:03 UTC) #16
Message was sent while issue was closed.
Patchset 7 (id:??) landed as
https://crrev.com/1b474d6a05616dbb12d788430075285bf7f11810
Cr-Commit-Position: refs/heads/master@{#397907}

Powered by Google App Engine
This is Rietveld 408576698