| Index: ash/shell/window_watcher_shelf_item_delegate.cc
|
| diff --git a/ash/shell/window_watcher_launcher_item_delegate.cc b/ash/shell/window_watcher_shelf_item_delegate.cc
|
| similarity index 47%
|
| rename from ash/shell/window_watcher_launcher_item_delegate.cc
|
| rename to ash/shell/window_watcher_shelf_item_delegate.cc
|
| index 76e39fd3f9d6c81a81d0d930079b6c9aeb7085bf..579ceb73e78dcad8c1ae40b16f3dc88e6c081e3c 100644
|
| --- a/ash/shell/window_watcher_launcher_item_delegate.cc
|
| +++ b/ash/shell/window_watcher_shelf_item_delegate.cc
|
| @@ -2,7 +2,7 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "ash/shell/window_watcher_launcher_item_delegate.h"
|
| +#include "ash/shell/window_watcher_shelf_item_delegate.h"
|
|
|
| #include "ash/shell/window_watcher.h"
|
| #include "ash/wm/window_util.h"
|
| @@ -11,47 +11,45 @@
|
| namespace ash {
|
| namespace shell {
|
|
|
| -WindowWatcherLauncherItemDelegate::WindowWatcherLauncherItemDelegate(
|
| - ash::LauncherID id,
|
| - ash::shell::WindowWatcher* watcher)
|
| - : id_(id),
|
| - watcher_(watcher) {
|
| +WindowWatcherShelfItemDelegate::WindowWatcherShelfItemDelegate(
|
| + LauncherID id,
|
| + WindowWatcher* watcher)
|
| + : id_(id), watcher_(watcher) {
|
| DCHECK_GT(id_, 0);
|
| DCHECK(watcher_);
|
| }
|
|
|
| -WindowWatcherLauncherItemDelegate::~WindowWatcherLauncherItemDelegate() {
|
| +WindowWatcherShelfItemDelegate::~WindowWatcherShelfItemDelegate() {
|
| }
|
|
|
| -bool WindowWatcherLauncherItemDelegate::ItemSelected(const ui::Event& event) {
|
| +bool WindowWatcherShelfItemDelegate::ItemSelected(const ui::Event& event) {
|
| aura::Window* window = watcher_->GetWindowByID(id_);
|
| if (window->type() == aura::client::WINDOW_TYPE_PANEL)
|
| - ash::wm::MoveWindowToEventRoot(window, event);
|
| + wm::MoveWindowToEventRoot(window, event);
|
| window->Show();
|
| - ash::wm::ActivateWindow(window);
|
| + wm::ActivateWindow(window);
|
| return false;
|
| }
|
|
|
| -base::string16 WindowWatcherLauncherItemDelegate::GetTitle() {
|
| +base::string16 WindowWatcherShelfItemDelegate::GetTitle() {
|
| return watcher_->GetWindowByID(id_)->title();
|
| }
|
|
|
| -ui::MenuModel* WindowWatcherLauncherItemDelegate::CreateContextMenu(
|
| +ui::MenuModel* WindowWatcherShelfItemDelegate::CreateContextMenu(
|
| aura::Window* root_window) {
|
| return NULL;
|
| }
|
|
|
| -ash::LauncherMenuModel*
|
| -WindowWatcherLauncherItemDelegate::CreateApplicationMenu(
|
| +LauncherMenuModel* WindowWatcherShelfItemDelegate::CreateApplicationMenu(
|
| int event_flags) {
|
| return NULL;
|
| }
|
|
|
| -bool WindowWatcherLauncherItemDelegate::IsDraggable() {
|
| +bool WindowWatcherShelfItemDelegate::IsDraggable() {
|
| return true;
|
| }
|
|
|
| -bool WindowWatcherLauncherItemDelegate::ShouldShowTooltip() {
|
| +bool WindowWatcherShelfItemDelegate::ShouldShowTooltip() {
|
| return true;
|
| }
|
|
|
|
|