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

Issue 2545923004: Remove LauncherItemController::type; use ShelfItems::type. (Closed)

Created:
4 years ago by msw
Modified:
4 years ago
Reviewers:
James Cook
CC:
chromium-reviews, kalyank, sadrul, extensions-reviews_chromium.org, chromium-apps-reviews_chromium.org, khmel
Target Ref:
refs/pending/heads/master
Project:
chromium
Visibility:
Public.

Description

Remove LauncherItemController::type; use ShelfItem::type. ShelfItem should contain the info needed for a shelf item. Reduce reliance on ShelfItemDelegate/LauncherItemController. (shrink ash<->chrome surface, prep for ShelfWindowWatcher use) Add ChromeLauncherController::[GetItem|SetItemType] helpers. Nix unused ash::TYPE_IME_MENU. Inline GetV1ApplicationsFromController BUG=557406 TEST=No Chrome OS shelf behavior changes or regressions. R=jamescook@chromium.org Committed: https://crrev.com/18242dedc63f2b5b095f6a93f04e0dca85de4292 Cr-Commit-Position: refs/heads/master@{#436014}

Patch Set 1 #

Patch Set 2 : Fix running app check; remove unrelated app_id change. #

Patch Set 3 : Update tests; fix test item running status. #

Total comments: 1

Patch Set 4 : Rebase. #

Total comments: 6

Patch Set 5 : Rebase; remove new LauncherItemController::TYPE_APP check. #

Unified diffs Side-by-side diffs Delta from patch set Stats (+92 lines, -137 lines) Patch
M ash/common/shelf/shelf_item_types.h View 1 chunk +0 lines, -3 lines 0 comments Download
M ash/common/shelf/shelf_model.cc View 1 chunk +0 lines, -2 lines 0 comments Download
M ash/common/shelf/shelf_view.cc View 4 chunks +2 lines, -6 lines 0 comments Download
M chrome/browser/ui/ash/launcher/app_shortcut_launcher_item_controller.cc View 1 chunk +1 line, -1 line 0 comments Download
M chrome/browser/ui/ash/launcher/app_window_launcher_item_controller.h View 1 chunk +1 line, -2 lines 0 comments Download
M chrome/browser/ui/ash/launcher/app_window_launcher_item_controller.cc View 4 chunks +1 line, -5 lines 0 comments Download
M chrome/browser/ui/ash/launcher/arc_app_deferred_launcher_controller.cc View 1 2 3 1 chunk +3 lines, -9 lines 0 comments Download
M chrome/browser/ui/ash/launcher/arc_app_deferred_launcher_item_controller.cc View 1 2 3 1 chunk +1 line, -1 line 0 comments Download
M chrome/browser/ui/ash/launcher/arc_app_launcher_browsertest.cc View 1 2 3 4 1 chunk +1 line, -6 lines 0 comments Download
M chrome/browser/ui/ash/launcher/arc_app_window_launcher_item_controller.cc View 1 2 3 4 1 chunk +1 line, -1 line 0 comments Download
M chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controller.cc View 1 chunk +1 line, -2 lines 0 comments Download
M chrome/browser/ui/ash/launcher/chrome_launcher_controller.h View 2 chunks +9 lines, -2 lines 0 comments Download
M chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.h View 3 chunks +3 lines, -5 lines 0 comments Download
M chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.cc View 1 6 chunks +38 lines, -36 lines 0 comments Download
M chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_browsertest.cc View 1 2 1 chunk +0 lines, -1 line 0 comments Download
M chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_unittest.cc View 1 2 3 5 chunks +8 lines, -13 lines 0 comments Download
M chrome/browser/ui/ash/launcher/chrome_launcher_controller_mus.h View 1 3 chunks +6 lines, -1 line 0 comments Download
M chrome/browser/ui/ash/launcher/chrome_launcher_controller_mus.cc View 2 chunks +12 lines, -1 line 0 comments Download
M chrome/browser/ui/ash/launcher/extension_app_window_launcher_controller.cc View 1 chunk +1 line, -2 lines 0 comments Download
M chrome/browser/ui/ash/launcher/extension_app_window_launcher_item_controller.h View 1 chunk +0 lines, -1 line 0 comments Download
M chrome/browser/ui/ash/launcher/extension_app_window_launcher_item_controller.cc View 1 chunk +1 line, -4 lines 0 comments Download
M chrome/browser/ui/ash/launcher/launcher_item_controller.h View 2 chunks +1 line, -14 lines 0 comments Download
M chrome/browser/ui/ash/launcher/launcher_item_controller.cc View 2 chunks +1 line, -19 lines 0 comments Download

Messages

Total messages: 26 (17 generated)
msw
Hey James, please take a look; thanks! https://codereview.chromium.org/2545923004/diff/40001/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.cc File chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.cc (right): https://codereview.chromium.org/2545923004/diff/40001/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.cc#newcode301 chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.cc:301: ash::TYPE_APP); note: ...
4 years ago (2016-12-02 02:59:26 UTC) #9
James Cook
LGTM. It's great to see less duplication between ash and chrome launcher stuff. https://codereview.chromium.org/2545923004/diff/60001/ash/common/shelf/shelf_item_types.h File ...
4 years ago (2016-12-02 19:27:18 UTC) #12
msw
https://codereview.chromium.org/2545923004/diff/60001/ash/common/shelf/shelf_item_types.h File ash/common/shelf/shelf_item_types.h (left): https://codereview.chromium.org/2545923004/diff/60001/ash/common/shelf/shelf_item_types.h#oldcode41 ash/common/shelf/shelf_item_types.h:41: // The expanded IME menu in the shelf. On ...
4 years ago (2016-12-02 19:37:58 UTC) #13
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.org/2545923004/60001
4 years ago (2016-12-02 19:39:00 UTC) #15
commit-bot: I haz the power
Try jobs failed on following builders: linux_chromium_chromeos_ozone_rel_ng on master.tryserver.chromium.linux (JOB_FAILED, http://build.chromium.org/p/tryserver.chromium.linux/builders/linux_chromium_chromeos_ozone_rel_ng/builds/281899)
4 years ago (2016-12-02 20:01:30 UTC) #17
msw
+CC khmel@ for arc, especially arc_app_launcher_browsertest.cc
4 years ago (2016-12-02 20:10:15 UTC) #18
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.org/2545923004/80001
4 years ago (2016-12-02 20:11:01 UTC) #21
commit-bot: I haz the power
Committed patchset #5 (id:80001)
4 years ago (2016-12-02 21:10:03 UTC) #24
commit-bot: I haz the power
4 years ago (2016-12-02 21:14:09 UTC) #26
Message was sent while issue was closed.
Patchset 5 (id:??) landed as
https://crrev.com/18242dedc63f2b5b095f6a93f04e0dca85de4292
Cr-Commit-Position: refs/heads/master@{#436014}

Powered by Google App Engine
This is Rietveld 408576698