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

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

Issue 2917013002: mash: Move ShelfModel* to ash/public/cpp. (Closed)
Patch Set: Comment on AppList item init. 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_window_watcher.cc ('k') | ash/shelf/shelf_window_watcher_unittest.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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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_window_watcher_item_delegate.h" 5 #include "ash/shelf/shelf_window_watcher_item_delegate.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "ash/public/cpp/shelf_model.h"
9 #include "ash/public/cpp/window_properties.h" 10 #include "ash/public/cpp/window_properties.h"
10 #include "ash/shelf/shelf_controller.h" 11 #include "ash/shelf/shelf_controller.h"
11 #include "ash/shelf/shelf_model.h"
12 #include "ash/shell.h" 12 #include "ash/shell.h"
13 #include "ash/wm/window_state.h" 13 #include "ash/wm/window_state.h"
14 #include "ash/wm/window_util.h" 14 #include "ash/wm/window_util.h"
15 #include "ui/aura/client/aura_constants.h" 15 #include "ui/aura/client/aura_constants.h"
16 #include "ui/aura/window.h" 16 #include "ui/aura/window.h"
17 #include "ui/events/event_constants.h" 17 #include "ui/events/event_constants.h"
18 #include "ui/wm/core/window_animations.h" 18 #include "ui/wm/core/window_animations.h"
19 19
20 namespace ash { 20 namespace ash {
21 21
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 } 68 }
69 69
70 void ShelfWindowWatcherItemDelegate::ExecuteCommand(uint32_t command_id, 70 void ShelfWindowWatcherItemDelegate::ExecuteCommand(uint32_t command_id,
71 int32_t event_flags) {} 71 int32_t event_flags) {}
72 72
73 void ShelfWindowWatcherItemDelegate::Close() { 73 void ShelfWindowWatcherItemDelegate::Close() {
74 wm::CloseWidgetForWindow(window_); 74 wm::CloseWidgetForWindow(window_);
75 } 75 }
76 76
77 } // namespace ash 77 } // namespace ash
OLDNEW
« no previous file with comments | « ash/shelf/shelf_window_watcher.cc ('k') | ash/shelf/shelf_window_watcher_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698