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

Side by Side Diff: ash/shelf/shelf.cc

Issue 2898743002: Draggable peeking/fullscreen launcher with transparent background. (Closed)
Patch Set: removed app_list_delegate_impl and made shell an AppListDelegate Created 3 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ash/shelf/shelf.h" 5 #include "ash/shelf/shelf.h"
6 6
7 #include "ash/public/cpp/config.h" 7 #include "ash/public/cpp/config.h"
8 #include "ash/public/cpp/shelf_item_delegate.h" 8 #include "ash/public/cpp/shelf_item_delegate.h"
9 #include "ash/public/cpp/shell_window_ids.h" 9 #include "ash/public/cpp/shell_window_ids.h"
10 #include "ash/root_window_controller.h" 10 #include "ash/root_window_controller.h"
11 #include "ash/session/session_controller.h" 11 #include "ash/session/session_controller.h"
12 #include "ash/shelf/app_list_button.h"
xiyuan 2017/06/06 15:51:04 unused?
newcomer 2017/06/06 16:42:29 Done.
12 #include "ash/shelf/shelf_bezel_event_handler.h" 13 #include "ash/shelf/shelf_bezel_event_handler.h"
13 #include "ash/shelf/shelf_controller.h" 14 #include "ash/shelf/shelf_controller.h"
14 #include "ash/shelf/shelf_layout_manager.h" 15 #include "ash/shelf/shelf_layout_manager.h"
15 #include "ash/shelf/shelf_model.h" 16 #include "ash/shelf/shelf_model.h"
16 #include "ash/shelf/shelf_observer.h" 17 #include "ash/shelf/shelf_observer.h"
17 #include "ash/shelf/shelf_widget.h" 18 #include "ash/shelf/shelf_widget.h"
18 #include "ash/shell.h" 19 #include "ash/shell.h"
19 #include "base/logging.h" 20 #include "base/logging.h"
20 #include "base/memory/ptr_util.h" 21 #include "base/memory/ptr_util.h"
22 #include "ui/app_list/app_list_features.h"
xiyuan 2017/06/06 15:51:04 unused?
newcomer 2017/06/06 16:42:29 Done.
21 #include "ui/display/types/display_constants.h" 23 #include "ui/display/types/display_constants.h"
22 #include "ui/gfx/geometry/rect.h" 24 #include "ui/gfx/geometry/rect.h"
23 25
24 namespace ash { 26 namespace ash {
25 27
26 namespace { 28 namespace {
27 29
28 // A callback that does nothing after shelf item selection handling. 30 // A callback that does nothing after shelf item selection handling.
29 void NoopCallback(ShelfAction, 31 void NoopCallback(ShelfAction,
30 base::Optional<std::vector<mojom::MenuItemPtr>>) {} 32 base::Optional<std::vector<mojom::MenuItemPtr>>) {}
(...skipping 326 matching lines...) Expand 10 before | Expand all | Expand 10 after
357 359
358 void Shelf::OnBackgroundUpdated(ShelfBackgroundType background_type, 360 void Shelf::OnBackgroundUpdated(ShelfBackgroundType background_type,
359 AnimationChangeType change_type) { 361 AnimationChangeType change_type) {
360 if (background_type == GetBackgroundType()) 362 if (background_type == GetBackgroundType())
361 return; 363 return;
362 for (auto& observer : observers_) 364 for (auto& observer : observers_)
363 observer.OnBackgroundTypeChanged(background_type, change_type); 365 observer.OnBackgroundTypeChanged(background_type, change_type);
364 } 366 }
365 367
366 } // namespace ash 368 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698