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/shell/window_watcher_shelf_item_delegate.cc

Issue 2608013002: mash: Replace ShelfItemDelegate::CanPin with ShelfItem::pinned_by_policy. (Closed)
Patch Set: Fix test. Created 3 years, 11 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/shell/window_watcher_shelf_item_delegate.h" 5 #include "ash/shell/window_watcher_shelf_item_delegate.h"
6 6
7 #include "ash/shell/window_watcher.h" 7 #include "ash/shell/window_watcher.h"
8 #include "ash/wm/window_util.h" 8 #include "ash/wm/window_util.h"
9 #include "ui/aura/window.h" 9 #include "ui/aura/window.h"
10 10
(...skipping 22 matching lines...) Expand all
33 33
34 base::string16 WindowWatcherShelfItemDelegate::GetTitle() { 34 base::string16 WindowWatcherShelfItemDelegate::GetTitle() {
35 return watcher_->GetWindowByID(id_)->GetTitle(); 35 return watcher_->GetWindowByID(id_)->GetTitle();
36 } 36 }
37 37
38 ShelfMenuModel* WindowWatcherShelfItemDelegate::CreateApplicationMenu( 38 ShelfMenuModel* WindowWatcherShelfItemDelegate::CreateApplicationMenu(
39 int event_flags) { 39 int event_flags) {
40 return nullptr; 40 return nullptr;
41 } 41 }
42 42
43 bool WindowWatcherShelfItemDelegate::CanPin() const {
44 return true;
45 }
46
47 void WindowWatcherShelfItemDelegate::Close() {} 43 void WindowWatcherShelfItemDelegate::Close() {}
48 44
49 } // namespace shell 45 } // namespace shell
50 } // namespace ash 46 } // namespace ash
OLDNEW
« no previous file with comments | « ash/shell/window_watcher_shelf_item_delegate.h ('k') | chrome/browser/ui/ash/launcher/app_shortcut_launcher_item_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698