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

Issue 1873903003: Revert of AppListController refactoring part 2: Ash's AppListShowerDelegate imlementation. (Closed)

Created:
4 years, 8 months ago by beaudoin
Modified:
4 years, 8 months ago
CC:
chromium-reviews, kalyank, sadrul
Base URL:
https://chromium.googlesource.com/chromium/src.git@mus_chrome_delegates_app_list_2
Target Ref:
refs/pending/heads/master
Project:
chromium
Visibility:
Public.

Description

Revert of AppListController refactoring part 2: Ash's AppListShowerDelegate imlementation. (patchset #8 id:160001 of https://codereview.chromium.org/1856943003/ ) Reason for revert: The reason for reverting is: Suspected to be causing that Mac problem: https://build.chromium.org/p/chromium/builders/Mac/builds/14169 Original issue's description: > AppListController refactoring part 2: Ash's AppListShowerDelegate imlementation. > > Part 1 of the refactoring: https://crrev.com/1830293002 > Design doc: https://docs.google.com/document/d/1M9vqTTuprMssRXs8UIVaFjQUq3lUxSzwrWoPjPvca6Q/edit?ts=56d0e9f0#heading=h.b2znwtuxd2x2 > > This CL adds ash::AppListShowerDelegate, which is the Ash implementation of > app_list::AppListShowerDelegate. At this point it is unused - Ash is still using > the old ash::AppListController class to control the app list. > > BUG=557408 > > Committed: https://crrev.com/412803081c9d4f4321d267133512f45ce434fc10 > Cr-Commit-Position: refs/heads/master@{#386123} TBR=sky@chromium.org,mgiuca@chromium.org,xiyuan@chromium.org,mfomitchev@chromium.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=557408

Patch Set 1 #

Unified diffs Side-by-side diffs Delta from patch set Stats (+4 lines, -761 lines) Patch
M ash/BUILD.gn View 4 chunks +4 lines, -4 lines 0 comments Download
D ash/app_list/app_list_shower_delegate.h View 1 chunk +0 lines, -102 lines 0 comments Download
D ash/app_list/app_list_shower_delegate.cc View 1 chunk +0 lines, -357 lines 0 comments Download
D ash/app_list/app_list_shower_delegate_factory.h View 1 chunk +0 lines, -40 lines 0 comments Download
D ash/app_list/app_list_shower_delegate_factory.cc View 1 chunk +0 lines, -25 lines 0 comments Download
D ash/app_list/app_list_shower_delegate_unittest.cc View 1 chunk +0 lines, -196 lines 0 comments Download
D ash/app_list/app_list_view_delegate_factory.h View 1 chunk +0 lines, -25 lines 0 comments Download
M ash/ash.gyp View 6 chunks +0 lines, -12 lines 0 comments Download

Messages

Total messages: 4 (1 generated)
beaudoin
Created Revert of AppListController refactoring part 2: Ash's AppListShowerDelegate imlementation.
4 years, 8 months ago (2016-04-08 20:12:19 UTC) #1
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1873903003/1 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1873903003/1
4 years, 8 months ago (2016-04-08 20:12:29 UTC) #2
commit-bot: I haz the power
4 years, 8 months ago (2016-04-08 20:13:36 UTC) #4
Failed to apply patch for ash/ash.gyp:
While running git apply --index -3 -p1;
  error: patch failed: ash/ash.gyp:818
  Falling back to three-way merge...
  Applied patch to 'ash/ash.gyp' with conflicts.
  U ash/ash.gyp

Patch:       ash/ash.gyp
Index: ash/ash.gyp
diff --git a/ash/ash.gyp b/ash/ash.gyp
index
be76e386fc0abdbced92fd64287f93a2b74fa641..af7a2426f1dec515f11e7a56cd1d5163d4d13486
100644
--- a/ash/ash.gyp
+++ b/ash/ash.gyp
@@ -28,11 +28,6 @@
       'accelerators/spoken_feedback_toggler.cc',
       'accelerators/spoken_feedback_toggler.h',
       'accessibility_delegate.h',
-      'app_list/app_list_shower_delegate.cc',
-      'app_list/app_list_shower_delegate.h',
-      'app_list/app_list_shower_delegate_factory.cc',
-      'app_list/app_list_shower_delegate_factory.h',
-      'app_list/app_list_view_delegate_factory.h',
       'ash_constants.cc',
       'ash_constants.h',
       'ash_export.h',
@@ -818,9 +813,6 @@
       'accelerators/accelerator_table_unittest.cc',
       'accelerators/magnifier_key_scroller_unittest.cc',
       'accelerators/spoken_feedback_toggler_unittest.cc',
-      # TODO(mfomitchev): uncomment when ash::Shell is switched to using
-      # app_list::AppListShower instead of ash::AppListController.
-#      'app_list/app_list_shower_delegate_unittest.cc',
       'ash_touch_exploration_manager_chromeos_unittest.cc',
       'autoclick/autoclick_unittest.cc',
       'content/display/screen_orientation_controller_chromeos_unittest.cc',
@@ -976,7 +968,6 @@
         '../third_party/icu/icu.gyp:icuuc',
         '../ui/accessibility/accessibility.gyp:accessibility',
         '../ui/app_list/app_list.gyp:app_list',
-        '../ui/app_list/shower/app_list_shower.gyp:app_list_shower',
         '../ui/aura/aura.gyp:aura',
         '../ui/base/ime/ui_base_ime.gyp:ui_base_ime',
         '../ui/base/ui_base.gyp:ui_base',
@@ -1111,7 +1102,6 @@
         '../testing/gtest.gyp:gtest',
         '../ui/accessibility/accessibility.gyp:ax_gen',
         '../ui/app_list/app_list.gyp:app_list_test_support',
-        '../ui/app_list/shower/app_list_shower.gyp:app_list_shower',
         '../ui/events/devices/events_devices.gyp:events_devices',
         '../ui/views/views.gyp:views_test_support',
         'ash',
@@ -1174,7 +1164,6 @@
         '../third_party/icu/icu.gyp:icuuc',
         '../ui/accessibility/accessibility.gyp:accessibility',
         '../ui/app_list/app_list.gyp:app_list',
-        '../ui/app_list/shower/app_list_shower.gyp:app_list_shower',
         '../ui/aura/aura.gyp:aura',
         '../ui/aura/aura.gyp:aura_test_support',
         '../ui/base/ime/ui_base_ime.gyp:ui_base_ime',
@@ -1274,7 +1263,6 @@
         '../third_party/icu/icu.gyp:icui18n',
         '../third_party/icu/icu.gyp:icuuc',
         '../ui/app_list/app_list.gyp:app_list',
-        '../ui/app_list/shower/app_list_shower.gyp:app_list_shower',
         '../ui/aura/aura.gyp:aura',
         '../ui/base/ime/ui_base_ime.gyp:ui_base_ime',
         '../ui/base/ui_base.gyp:ui_base',

Powered by Google App Engine
This is Rietveld 408576698