OLD | NEW |
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 |
11 namespace ash { | 11 namespace ash { |
12 namespace shell { | 12 namespace shell { |
13 | 13 |
14 WindowWatcherShelfItemDelegate::WindowWatcherShelfItemDelegate( | 14 WindowWatcherShelfItemDelegate::WindowWatcherShelfItemDelegate( |
15 ShelfID id, | 15 ShelfID id, |
16 WindowWatcher* watcher) | 16 WindowWatcher* watcher) |
17 : id_(id), watcher_(watcher) { | 17 : id_(id), watcher_(watcher) { |
18 DCHECK_GT(id_, 0); | 18 DCHECK_GT(id_, 0); |
19 DCHECK(watcher_); | 19 DCHECK(watcher_); |
20 } | 20 } |
21 | 21 |
22 WindowWatcherShelfItemDelegate::~WindowWatcherShelfItemDelegate() { | 22 WindowWatcherShelfItemDelegate::~WindowWatcherShelfItemDelegate() {} |
23 } | |
24 | 23 |
25 ShelfItemDelegate::PerformedAction WindowWatcherShelfItemDelegate::ItemSelected( | 24 ShelfItemDelegate::PerformedAction WindowWatcherShelfItemDelegate::ItemSelected( |
26 const ui::Event& event) { | 25 const ui::Event& event) { |
27 aura::Window* window = watcher_->GetWindowByID(id_); | 26 aura::Window* window = watcher_->GetWindowByID(id_); |
28 if (window->type() == ui::wm::WINDOW_TYPE_PANEL) | 27 if (window->type() == ui::wm::WINDOW_TYPE_PANEL) |
29 wm::MoveWindowToEventRoot(window, event); | 28 wm::MoveWindowToEventRoot(window, event); |
30 window->Show(); | 29 window->Show(); |
31 wm::ActivateWindow(window); | 30 wm::ActivateWindow(window); |
32 return kExistingWindowActivated; | 31 return kExistingWindowActivated; |
33 } | 32 } |
(...skipping 12 matching lines...) Expand all Loading... |
46 } | 45 } |
47 | 46 |
48 bool WindowWatcherShelfItemDelegate::CanPin() const { | 47 bool WindowWatcherShelfItemDelegate::CanPin() const { |
49 return true; | 48 return true; |
50 } | 49 } |
51 | 50 |
52 bool WindowWatcherShelfItemDelegate::ShouldShowTooltip() { | 51 bool WindowWatcherShelfItemDelegate::ShouldShowTooltip() { |
53 return true; | 52 return true; |
54 } | 53 } |
55 | 54 |
56 void WindowWatcherShelfItemDelegate::Close() { | 55 void WindowWatcherShelfItemDelegate::Close() {} |
57 } | |
58 | 56 |
59 } // namespace shell | 57 } // namespace shell |
60 } // namespace ash | 58 } // namespace ash |
OLD | NEW |