|
Merge ShelfItemDelegate::ItemSelected & LauncherItemDelegate::Activate.
These functions have nearly identical purposes; merge them.
(app-list used Activate via ChromeLauncherControllerImpl::ActivateApp)
Split up the ui::Event argument into constituent pieces.
(this will help when converting the function to support mojo)
Move ash::LaunchSource (in src/chrome) -> ash::ShelfLaunchSource.
Move ash::ShelfItemDelegate::PerformedAction -> ash::ShelfAction.
(also update its kConstantValueNaming to ENUM_VALUE_NAMING)
Add ash::wm::MoveWindowToDisplay helper; minor refactor; add test.
BUG= 557406
TEST=No behavior changes selecting/activating shelf or app-list items.
R=jamescook@chromium.org
Review-Url: https://codereview.chromium.org/2696073002
Cr-Commit-Position: refs/heads/master@{#451072}
Committed: https://chromium.googlesource.com/chromium/src/+/c30c27728fcf046088ca6c0da51bda06e3a5ce63
Total comments: 20
Total comments: 2
Total comments: 2
|
Unified diffs |
Side-by-side diffs |
Delta from patch set |
Stats (+422 lines, -342 lines) |
Patch |
|
M |
ash/BUILD.gn
|
View
|
1
2
3
|
1 chunk |
+1 line, -0 lines |
0 comments
|
Download
|
|
M |
ash/common/shelf/app_list_shelf_item_delegate.h
|
View
|
|
1 chunk |
+4 lines, -2 lines |
0 comments
|
Download
|
|
M |
ash/common/shelf/app_list_shelf_item_delegate.cc
|
View
|
1
2
|
1 chunk |
+5 lines, -3 lines |
0 comments
|
Download
|
|
M |
ash/common/shelf/shelf_button_pressed_metric_tracker.h
|
View
|
|
2 chunks |
+2 lines, -3 lines |
0 comments
|
Download
|
|
M |
ash/common/shelf/shelf_button_pressed_metric_tracker.cc
|
View
|
1
2
|
3 chunks |
+10 lines, -10 lines |
0 comments
|
Download
|
|
M |
ash/common/shelf/shelf_button_pressed_metric_tracker_unittest.cc
|
View
|
1
2
|
11 chunks |
+21 lines, -24 lines |
0 comments
|
Download
|
|
M |
ash/common/shelf/shelf_controller.cc
|
View
|
1
2
|
1 chunk |
+8 lines, -5 lines |
0 comments
|
Download
|
|
M |
ash/common/shelf/shelf_item_delegate.h
|
View
|
1
2
3
4
|
2 chunks |
+18 lines, -27 lines |
0 comments
|
Download
|
|
A |
ash/common/shelf/shelf_item_delegate.cc
|
View
|
1
2
3
|
1 chunk |
+19 lines, -0 lines |
0 comments
|
Download
|
|
M |
ash/common/shelf/shelf_view.cc
|
View
|
1
2
|
2 chunks |
+8 lines, -6 lines |
0 comments
|
Download
|
|
M |
ash/common/shelf/shelf_window_watcher_item_delegate.h
|
View
|
1
|
2 chunks |
+4 lines, -3 lines |
0 comments
|
Download
|
|
M |
ash/common/shelf/shelf_window_watcher_item_delegate.cc
|
View
|
1
2
|
2 chunks |
+13 lines, -9 lines |
0 comments
|
Download
|
|
M |
ash/common/shelf/wm_shelf.cc
|
View
|
1
2
|
2 chunks |
+3 lines, -7 lines |
0 comments
|
Download
|
|
M |
ash/common/test/test_shelf_item_delegate.h
|
View
|
|
1 chunk |
+4 lines, -2 lines |
0 comments
|
Download
|
|
M |
ash/common/test/test_shelf_item_delegate.cc
|
View
|
1
2
|
2 chunks |
+8 lines, -5 lines |
0 comments
|
Download
|
|
M |
ash/public/cpp/shelf_types.h
|
View
|
1
2
|
1 chunk |
+30 lines, -0 lines |
0 comments
|
Download
|
|
M |
ash/shelf/shelf_view_unittest.cc
|
View
|
1
2
|
5 chunks |
+10 lines, -12 lines |
0 comments
|
Download
|
|
M |
ash/shell/window_watcher_shelf_item_delegate.h
|
View
|
|
1 chunk |
+4 lines, -2 lines |
0 comments
|
Download
|
|
M |
ash/shell/window_watcher_shelf_item_delegate.cc
|
View
|
1
2
|
1 chunk |
+7 lines, -4 lines |
0 comments
|
Download
|
|
M |
ash/wm/window_util.h
|
View
|
1
|
2 chunks |
+7 lines, -1 line |
0 comments
|
Download
|
|
M |
ash/wm/window_util.cc
|
View
|
1
2
|
3 chunks |
+28 lines, -9 lines |
0 comments
|
Download
|
|
M |
ash/wm/window_util_unittest.cc
|
View
|
1
2
|
4 chunks |
+43 lines, -6 lines |
0 comments
|
Download
|
|
M |
chrome/browser/ui/ash/app_list/app_list_controller_ash.h
|
View
|
|
2 chunks |
+2 lines, -2 lines |
0 comments
|
Download
|
|
M |
chrome/browser/ui/ash/app_list/app_list_controller_ash.cc
|
View
|
|
1 chunk |
+2 lines, -1 line |
0 comments
|
Download
|
|
M |
chrome/browser/ui/ash/launcher/app_shortcut_launcher_item_controller.h
|
View
|
|
2 chunks |
+5 lines, -6 lines |
0 comments
|
Download
|
|
M |
chrome/browser/ui/ash/launcher/app_shortcut_launcher_item_controller.cc
|
View
|
1
2
|
3 chunks |
+13 lines, -15 lines |
0 comments
|
Download
|
|
M |
chrome/browser/ui/ash/launcher/app_window_launcher_item_controller.h
|
View
|
1
2
|
2 chunks |
+10 lines, -11 lines |
0 comments
|
Download
|
|
M |
chrome/browser/ui/ash/launcher/app_window_launcher_item_controller.cc
|
View
|
1
2
|
3 chunks |
+10 lines, -17 lines |
0 comments
|
Download
|
|
M |
chrome/browser/ui/ash/launcher/arc_app_deferred_launcher_item_controller.h
|
View
|
|
1 chunk |
+4 lines, -6 lines |
0 comments
|
Download
|
|
M |
chrome/browser/ui/ash/launcher/arc_app_deferred_launcher_item_controller.cc
|
View
|
1
2
|
2 chunks |
+6 lines, -8 lines |
0 comments
|
Download
|
|
M |
chrome/browser/ui/ash/launcher/arc_app_window_launcher_item_controller.h
|
View
|
|
1 chunk |
+4 lines, -2 lines |
0 comments
|
Download
|
|
M |
chrome/browser/ui/ash/launcher/arc_app_window_launcher_item_controller.cc
|
View
|
1
2
|
1 chunk |
+14 lines, -10 lines |
0 comments
|
Download
|
|
M |
chrome/browser/ui/ash/launcher/arc_playstore_shortcut_launcher_item_controller.h
|
View
|
|
2 chunks |
+4 lines, -3 lines |
0 comments
|
Download
|
|
M |
chrome/browser/ui/ash/launcher/arc_playstore_shortcut_launcher_item_controller.cc
|
View
|
1
2
|
2 chunks |
+6 lines, -3 lines |
0 comments
|
Download
|
|
M |
chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controller.h
|
View
|
1
2
|
2 chunks |
+7 lines, -7 lines |
0 comments
|
Download
|
|
M |
chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controller.cc
|
View
|
1
2
|
5 chunks |
+20 lines, -22 lines |
0 comments
|
Download
|
|
M |
chrome/browser/ui/ash/launcher/chrome_launcher_controller.h
|
View
|
1
2
|
3 chunks |
+7 lines, -8 lines |
0 comments
|
Download
|
|
M |
chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc
|
View
|
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
|
M |
chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.h
|
View
|
|
2 chunks |
+2 lines, -2 lines |
0 comments
|
Download
|
|
M |
chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.cc
|
View
|
1
2
3
|
4 chunks |
+9 lines, -12 lines |
0 comments
|
Download
|
|
M |
chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_browsertest.cc
|
View
|
1
2
3
|
9 chunks |
+25 lines, -24 lines |
0 comments
|
Download
|
|
M |
chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_unittest.cc
|
View
|
1
2
|
1 chunk |
+5 lines, -7 lines |
0 comments
|
Download
|
|
M |
chrome/browser/ui/ash/launcher/chrome_launcher_controller_mus.h
|
View
|
|
2 chunks |
+2 lines, -2 lines |
0 comments
|
Download
|
|
M |
chrome/browser/ui/ash/launcher/chrome_launcher_controller_mus.cc
|
View
|
1
2
|
2 chunks |
+3 lines, -4 lines |
0 comments
|
Download
|
|
D |
chrome/browser/ui/ash/launcher/chrome_launcher_types.h
|
View
|
|
1 chunk |
+0 lines, -19 lines |
0 comments
|
Download
|
|
M |
chrome/browser/ui/ash/launcher/launcher_controller_helper.h
|
View
|
|
2 chunks |
+2 lines, -2 lines |
0 comments
|
Download
|
|
M |
chrome/browser/ui/ash/launcher/launcher_controller_helper.cc
|
View
|
|
2 chunks |
+2 lines, -2 lines |
0 comments
|
Download
|
|
M |
chrome/browser/ui/ash/launcher/launcher_item_controller.h
|
View
|
|
2 chunks |
+0 lines, -6 lines |
0 comments
|
Download
|
Total messages: 40 (26 generated)
|