Index: ash/common/shelf/shelf_controller.cc |
diff --git a/ash/common/shelf/shelf_controller.cc b/ash/common/shelf/shelf_controller.cc |
deleted file mode 100644 |
index 5bfece459d04d7b7e138ee7374678e1b1f0fcf3c..0000000000000000000000000000000000000000 |
--- a/ash/common/shelf/shelf_controller.cc |
+++ /dev/null |
@@ -1,244 +0,0 @@ |
-// Copyright 2016 The Chromium Authors. All rights reserved. |
-// Use of this source code is governed by a BSD-style license that can be |
-// found in the LICENSE file. |
- |
-#include "ash/common/shelf/shelf_controller.h" |
- |
-#include "ash/common/shelf/shelf_item_delegate.h" |
-#include "ash/common/shelf/wm_shelf.h" |
-#include "ash/common/wm_shell.h" |
-#include "ash/common/wm_window.h" |
-#include "ash/root_window_controller.h" |
-#include "ash/shell.h" |
-#include "base/strings/utf_string_conversions.h" |
-#include "ui/base/models/simple_menu_model.h" |
-#include "ui/base/resource/resource_bundle.h" |
-#include "ui/display/display.h" |
-#include "ui/display/screen.h" |
-#include "ui/gfx/image/image_skia.h" |
-#include "ui/resources/grit/ui_resources.h" |
- |
-namespace ash { |
- |
-namespace { |
- |
-// A ShelfItemDelegate used for pinned items in mash. |
-// TODO(mash): Support open windows, cooperate with ShelfWindowWatcher. |
-class ShelfItemDelegateMus : public ShelfItemDelegate { |
- public: |
- ShelfItemDelegateMus() {} |
- ~ShelfItemDelegateMus() override {} |
- |
- void SetDelegate(mojom::ShelfItemDelegateAssociatedPtrInfo delegate) { |
- delegate_.Bind(std::move(delegate)); |
- } |
- |
- bool pinned() const { return pinned_; } |
- void set_pinned(bool pinned) { pinned_ = pinned; } |
- |
- void AddWindow(uint32_t id, const base::string16& title) { |
- DCHECK(!window_id_to_title_.count(id)); |
- window_id_to_title_.insert(std::make_pair(id, title)); |
- } |
- void RemoveWindow(uint32_t id) { window_id_to_title_.erase(id); } |
- void SetWindowTitle(uint32_t id, const base::string16& title) { |
- DCHECK(window_id_to_title_.count(id)); |
- window_id_to_title_[id] = title; |
- } |
- const std::map<uint32_t, base::string16>& window_id_to_title() const { |
- return window_id_to_title_; |
- } |
- |
- const base::string16& title() { return title_; } |
- void set_title(const base::string16& title) { title_ = title; } |
- |
- private: |
- // ShelfItemDelegate: |
- ShelfAction ItemSelected(ui::EventType event_type, |
- int event_flags, |
- int64_t display_id, |
- ShelfLaunchSource source) override { |
- if (window_id_to_title_.empty()) { |
- delegate_->LaunchItem(); |
- return SHELF_ACTION_NEW_WINDOW_CREATED; |
- } |
- if (window_id_to_title_.size() == 1) { |
- // TODO(mash): Activate the window and return |
- // SHELF_ACTION_WINDOW_ACTIVATED. |
- NOTIMPLEMENTED(); |
- } |
- return SHELF_ACTION_NONE; |
- } |
- |
- ShelfAppMenuItemList GetAppMenuItems(int event_flags) override { |
- // Return an empty item list to avoid showing an application menu. |
- return ShelfAppMenuItemList(); |
- } |
- |
- void ExecuteCommand(uint32_t command_id, int event_flags) override { |
- // This delegate does not support showing an application menu. |
- NOTIMPLEMENTED(); |
- } |
- |
- void Close() override { NOTIMPLEMENTED(); } |
- |
- mojom::ShelfItemDelegateAssociatedPtr delegate_; |
- bool pinned_ = false; |
- std::map<uint32_t, base::string16> window_id_to_title_; |
- base::string16 title_; |
- |
- DISALLOW_COPY_AND_ASSIGN(ShelfItemDelegateMus); |
-}; |
- |
-// Returns the ShelfItemDelegateMus instance for the given |shelf_id|. |
-ShelfItemDelegateMus* GetShelfItemDelegate(ShelfID shelf_id) { |
- return static_cast<ShelfItemDelegateMus*>( |
- WmShell::Get()->shelf_model()->GetShelfItemDelegate(shelf_id)); |
-} |
- |
-// Returns an icon image from an SkBitmap, or the default shelf icon image if |
-// the bitmap is empty. Assumes the bitmap is a 1x icon. |
-// TODO(jamescook): Support other scale factors. |
-gfx::ImageSkia GetShelfIconFromBitmap(const SkBitmap& bitmap) { |
- gfx::ImageSkia icon_image; |
- if (!bitmap.isNull()) { |
- icon_image = gfx::ImageSkia::CreateFrom1xBitmap(bitmap); |
- } else { |
- // Use default icon. |
- ResourceBundle& rb = ResourceBundle::GetSharedInstance(); |
- icon_image = *rb.GetImageSkiaNamed(IDR_DEFAULT_FAVICON); |
- } |
- return icon_image; |
-} |
- |
-// Returns the WmShelf instance for the display with the given |display_id|. |
-WmShelf* GetShelfForDisplay(int64_t display_id) { |
- // The controller may be null for invalid ids or for displays being removed. |
- RootWindowController* root_window_controller = |
- Shell::GetRootWindowControllerWithDisplayId(display_id); |
- return root_window_controller ? root_window_controller->GetShelf() : nullptr; |
-} |
- |
-} // namespace |
- |
-ShelfController::ShelfController() {} |
- |
-ShelfController::~ShelfController() {} |
- |
-void ShelfController::BindRequest(mojom::ShelfControllerRequest request) { |
- bindings_.AddBinding(this, std::move(request)); |
-} |
- |
-void ShelfController::NotifyShelfCreated(WmShelf* shelf) { |
- // Notify observers, Chrome will set alignment and auto-hide from prefs. |
- int64_t display_id = shelf->GetWindow()->GetDisplayNearestWindow().id(); |
- observers_.ForAllPtrs([display_id](mojom::ShelfObserver* observer) { |
- observer->OnShelfCreated(display_id); |
- }); |
-} |
- |
-void ShelfController::NotifyShelfAlignmentChanged(WmShelf* shelf) { |
- ShelfAlignment alignment = shelf->alignment(); |
- int64_t display_id = shelf->GetWindow()->GetDisplayNearestWindow().id(); |
- observers_.ForAllPtrs( |
- [alignment, display_id](mojom::ShelfObserver* observer) { |
- observer->OnAlignmentChanged(alignment, display_id); |
- }); |
-} |
- |
-void ShelfController::NotifyShelfAutoHideBehaviorChanged(WmShelf* shelf) { |
- ShelfAutoHideBehavior behavior = shelf->auto_hide_behavior(); |
- int64_t display_id = shelf->GetWindow()->GetDisplayNearestWindow().id(); |
- observers_.ForAllPtrs([behavior, display_id](mojom::ShelfObserver* observer) { |
- observer->OnAutoHideBehaviorChanged(behavior, display_id); |
- }); |
-} |
- |
-void ShelfController::AddObserver( |
- mojom::ShelfObserverAssociatedPtrInfo observer) { |
- mojom::ShelfObserverAssociatedPtr observer_ptr; |
- observer_ptr.Bind(std::move(observer)); |
- observers_.AddPtr(std::move(observer_ptr)); |
-} |
- |
-void ShelfController::SetAlignment(ShelfAlignment alignment, |
- int64_t display_id) { |
- if (!ash::WmShelf::CanChangeShelfAlignment()) |
- return; |
- |
- WmShelf* shelf = GetShelfForDisplay(display_id); |
- // TODO(jamescook): The initialization check should not be necessary, but |
- // otherwise this wrongly tries to set the alignment on a secondary display |
- // during login before the ShelfLockingManager and ShelfView are created. |
- if (shelf && shelf->IsShelfInitialized()) |
- shelf->SetAlignment(alignment); |
-} |
- |
-void ShelfController::SetAutoHideBehavior(ShelfAutoHideBehavior auto_hide, |
- int64_t display_id) { |
- WmShelf* shelf = GetShelfForDisplay(display_id); |
- // TODO(jamescook): The initialization check should not be necessary, but |
- // otherwise this wrongly tries to set auto-hide state on a secondary display |
- // during login before the ShelfView is created. |
- if (shelf && shelf->IsShelfInitialized()) |
- shelf->SetAutoHideBehavior(auto_hide); |
-} |
- |
-void ShelfController::PinItem( |
- mojom::ShelfItemPtr item, |
- mojom::ShelfItemDelegateAssociatedPtrInfo delegate) { |
- if (app_id_to_shelf_id_.count(item->app_id)) { |
- ShelfID shelf_id = app_id_to_shelf_id_[item->app_id]; |
- ShelfItemDelegateMus* item_delegate = GetShelfItemDelegate(shelf_id); |
- item_delegate->SetDelegate(std::move(delegate)); |
- item_delegate->set_pinned(true); |
- return; |
- } |
- |
- ShelfID shelf_id = model_.next_id(); |
- app_id_to_shelf_id_.insert(std::make_pair(item->app_id, shelf_id)); |
- shelf_id_to_app_id_.insert(std::make_pair(shelf_id, item->app_id)); |
- |
- ShelfItem shelf_item; |
- shelf_item.type = TYPE_APP_SHORTCUT; |
- shelf_item.status = STATUS_CLOSED; |
- shelf_item.image = GetShelfIconFromBitmap(item->image); |
- shelf_item.title = base::UTF8ToUTF16(item->app_title); |
- model_.Add(shelf_item); |
- |
- std::unique_ptr<ShelfItemDelegateMus> item_delegate = |
- base::MakeUnique<ShelfItemDelegateMus>(); |
- item_delegate->SetDelegate(std::move(delegate)); |
- item_delegate->set_pinned(true); |
- item_delegate->set_title(shelf_item.title); |
- model_.SetShelfItemDelegate(shelf_id, std::move(item_delegate)); |
-} |
- |
-void ShelfController::UnpinItem(const std::string& app_id) { |
- if (!app_id_to_shelf_id_.count(app_id)) |
- return; |
- |
- ShelfID shelf_id = app_id_to_shelf_id_[app_id]; |
- ShelfItemDelegateMus* item_delegate = GetShelfItemDelegate(shelf_id); |
- DCHECK(item_delegate->pinned()); |
- item_delegate->set_pinned(false); |
- if (item_delegate->window_id_to_title().empty()) { |
- model_.RemoveItemAt(model_.ItemIndexByID(shelf_id)); |
- app_id_to_shelf_id_.erase(app_id); |
- shelf_id_to_app_id_.erase(shelf_id); |
- } |
-} |
- |
-void ShelfController::SetItemImage(const std::string& app_id, |
- const SkBitmap& image) { |
- if (!app_id_to_shelf_id_.count(app_id)) |
- return; |
- ShelfID shelf_id = app_id_to_shelf_id_[app_id]; |
- int index = model_.ItemIndexByID(shelf_id); |
- DCHECK_GE(index, 0); |
- ShelfItem item = *model_.ItemByID(shelf_id); |
- item.image = GetShelfIconFromBitmap(image); |
- model_.Set(index, item); |
-} |
- |
-} // namespace ash |