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

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

Issue 2671923002: mash: Cleanup ash shelf application menu code. (Closed)
Patch Set: Fix tests; cleanup. Created 3 years, 10 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 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/common/shelf/shelf_window_watcher_item_delegate.h" 5 #include "ash/common/shelf/shelf_window_watcher_item_delegate.h"
6 6
7 #include "ash/common/shelf/shelf_controller.h" 7 #include "ash/common/shelf/shelf_controller.h"
8 #include "ash/common/shelf/shelf_model.h" 8 #include "ash/common/shelf/shelf_model.h"
9 #include "ash/common/wm/window_state.h" 9 #include "ash/common/wm/window_state.h"
10 #include "ash/common/wm_shell.h" 10 #include "ash/common/wm_shell.h"
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 window_->Animate(::wm::WINDOW_ANIMATION_TYPE_BOUNCE); 48 window_->Animate(::wm::WINDOW_ANIMATION_TYPE_BOUNCE);
49 return kNoAction; 49 return kNoAction;
50 } 50 }
51 window_->Minimize(); 51 window_->Minimize();
52 return kExistingWindowMinimized; 52 return kExistingWindowMinimized;
53 } 53 }
54 window_->Activate(); 54 window_->Activate();
55 return kExistingWindowActivated; 55 return kExistingWindowActivated;
56 } 56 }
57 57
58 ui::SimpleMenuModel* ShelfWindowWatcherItemDelegate::CreateApplicationMenu( 58 ShelfApplicationMenuItems ShelfWindowWatcherItemDelegate::GetAppMenuItems(
59 int event_flags) { 59 int event_flags) {
60 return nullptr; 60 return ShelfApplicationMenuItems();
61 } 61 }
62 62
63 void ShelfWindowWatcherItemDelegate::Close() { 63 void ShelfWindowWatcherItemDelegate::Close() {
64 window_->CloseWidget(); 64 window_->CloseWidget();
65 } 65 }
66 66
67 } // namespace ash 67 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698