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

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

Issue 2915553004: mash: Remove last WmWindow uses in ash/shelf. (Closed)
Patch Set: 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
« no previous file with comments | « ash/shelf/shelf.cc ('k') | ash/shelf/shelf_view.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_controller.h" 5 #include "ash/shelf/shelf_controller.h"
6 6
7 #include "ash/public/interfaces/shelf.mojom.h" 7 #include "ash/public/interfaces/shelf.mojom.h"
8 #include "ash/root_window_controller.h" 8 #include "ash/root_window_controller.h"
9 #include "ash/session/session_controller.h" 9 #include "ash/session/session_controller.h"
10 #include "ash/shelf/app_list_shelf_item_delegate.h" 10 #include "ash/shelf/app_list_shelf_item_delegate.h"
11 #include "ash/shelf/shelf.h" 11 #include "ash/shelf/shelf.h"
12 #include "ash/shell.h" 12 #include "ash/shell.h"
13 #include "ash/wm_window.h"
14 #include "base/strings/utf_string_conversions.h" 13 #include "base/strings/utf_string_conversions.h"
15 #include "ui/base/models/simple_menu_model.h" 14 #include "ui/base/models/simple_menu_model.h"
16 #include "ui/display/display.h" 15 #include "ui/display/display.h"
17 #include "ui/display/screen.h" 16 #include "ui/display/screen.h"
18 17
19 namespace ash { 18 namespace ash {
20 19
21 namespace { 20 namespace {
22 21
23 // Returns the Shelf instance for the display with the given |display_id|. 22 // Returns the Shelf instance for the display with the given |display_id|.
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
108 void ShelfController::UnpinItem(const std::string& app_id) { 107 void ShelfController::UnpinItem(const std::string& app_id) {
109 NOTIMPLEMENTED(); 108 NOTIMPLEMENTED();
110 } 109 }
111 110
112 void ShelfController::SetItemImage(const std::string& app_id, 111 void ShelfController::SetItemImage(const std::string& app_id,
113 const SkBitmap& image) { 112 const SkBitmap& image) {
114 NOTIMPLEMENTED(); 113 NOTIMPLEMENTED();
115 } 114 }
116 115
117 } // namespace ash 116 } // namespace ash
OLDNEW
« no previous file with comments | « ash/shelf/shelf.cc ('k') | ash/shelf/shelf_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698