Index: ash/app_list/app_list_shower_delegate.cc |
diff --git a/ash/app_list/app_list_shower_delegate.cc b/ash/app_list/app_list_shower_delegate.cc |
deleted file mode 100644 |
index f79d9f91d485f3267049ba430bd82c5e6940e62c..0000000000000000000000000000000000000000 |
--- a/ash/app_list/app_list_shower_delegate.cc |
+++ /dev/null |
@@ -1,357 +0,0 @@ |
-// Copyright (c) 2012 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/app_list/app_list_shower_delegate.h" |
- |
-#include "ash/app_list/app_list_view_delegate_factory.h" |
-#include "ash/ash_switches.h" |
-#include "ash/root_window_controller.h" |
-#include "ash/screen_util.h" |
-#include "ash/shelf/shelf.h" |
-#include "ash/shelf/shelf_layout_manager.h" |
-#include "ash/shell.h" |
-#include "ash/shell_delegate.h" |
-#include "ash/shell_window_ids.h" |
-#include "ash/wm/maximize_mode/maximize_mode_controller.h" |
-#include "base/command_line.h" |
-#include "ui/app_list/app_list_constants.h" |
-#include "ui/app_list/app_list_switches.h" |
-#include "ui/app_list/shower/app_list_shower.h" |
-#include "ui/app_list/views/app_list_view.h" |
-#include "ui/aura/window.h" |
-#include "ui/events/event.h" |
-#include "ui/keyboard/keyboard_controller.h" |
-#include "ui/views/widget/widget.h" |
- |
-namespace ash { |
-namespace { |
- |
-// Offset in pixels to animation away/towards the shelf. |
-const int kAnimationOffset = 8; |
- |
-// The minimal anchor position offset to make sure that the bubble is still on |
-// the screen with 8 pixels spacing on the left / right. This constant is a |
-// result of minimal bubble arrow sizes and offsets. |
-const int kMinimalAnchorPositionOffset = 57; |
- |
-// The minimal margin (in pixels) around the app list when in centered mode. |
-const int kMinimalCenteredAppListMargin = 10; |
- |
-// Gets arrow location based on shelf alignment. |
-views::BubbleBorder::Arrow GetBubbleArrow(aura::Window* window) { |
- DCHECK(Shell::HasInstance()); |
- return Shelf::ForWindow(window)->SelectValueForShelfAlignment( |
- views::BubbleBorder::BOTTOM_CENTER, views::BubbleBorder::LEFT_CENTER, |
- views::BubbleBorder::RIGHT_CENTER); |
-} |
- |
-// Using |button_bounds|, determine the anchor offset so that the bubble gets |
-// shown above the shelf (used for the alternate shelf theme). |
-gfx::Vector2d GetAnchorPositionOffsetToShelf( |
- const gfx::Rect& button_bounds, views::Widget* widget) { |
- DCHECK(Shell::HasInstance()); |
- ShelfAlignment shelf_alignment = Shell::GetInstance()->GetShelfAlignment( |
- widget->GetNativeView()->GetRootWindow()); |
- gfx::Point anchor(button_bounds.CenterPoint()); |
- switch (shelf_alignment) { |
- case SHELF_ALIGNMENT_BOTTOM: |
- if (base::i18n::IsRTL()) { |
- int screen_width = widget->GetWorkAreaBoundsInScreen().width(); |
- return gfx::Vector2d( |
- std::min(screen_width - kMinimalAnchorPositionOffset - anchor.x(), |
- 0), 0); |
- } |
- return gfx::Vector2d( |
- std::max(kMinimalAnchorPositionOffset - anchor.x(), 0), 0); |
- case SHELF_ALIGNMENT_LEFT: |
- return gfx::Vector2d( |
- 0, std::max(kMinimalAnchorPositionOffset - anchor.y(), 0)); |
- case SHELF_ALIGNMENT_RIGHT: |
- return gfx::Vector2d( |
- 0, std::max(kMinimalAnchorPositionOffset - anchor.y(), 0)); |
- } |
- NOTREACHED(); |
- return gfx::Vector2d(); |
-} |
- |
-// Gets the point at the center of the display that a particular view is on. |
-// This calculation excludes the virtual keyboard area. If the height of the |
-// display area is less than |minimum_height|, its bottom will be extended to |
-// that height (so that the app list never starts above the top of the screen). |
-gfx::Point GetCenterOfDisplayForView(const views::View* view, |
- int minimum_height) { |
- aura::Window* window = view->GetWidget()->GetNativeView(); |
- gfx::Rect bounds = ScreenUtil::GetShelfDisplayBoundsInRoot(window); |
- bounds = ScreenUtil::ConvertRectToScreen(window->GetRootWindow(), bounds); |
- |
- // If the virtual keyboard is active, subtract it from the display bounds, so |
- // that the app list is centered in the non-keyboard area of the display. |
- // (Note that work_area excludes the keyboard, but it doesn't get updated |
- // until after this function is called.) |
- keyboard::KeyboardController* keyboard_controller = |
- keyboard::KeyboardController::GetInstance(); |
- if (keyboard_controller && keyboard_controller->keyboard_visible()) |
- bounds.Subtract(keyboard_controller->current_keyboard_bounds()); |
- |
- // Apply the |minimum_height|. |
- if (bounds.height() < minimum_height) |
- bounds.set_height(minimum_height); |
- |
- return bounds.CenterPoint(); |
-} |
- |
-// Gets the minimum height of the rectangle to center the app list in. |
-int GetMinimumBoundsHeightForAppList(const app_list::AppListView* app_list) { |
- return app_list->bounds().height() + 2 * kMinimalCenteredAppListMargin; |
-} |
- |
-bool IsFullscreenAppListEnabled() { |
-#if defined(OS_CHROMEOS) |
- return base::CommandLine::ForCurrentProcess()->HasSwitch( |
- switches::kAshEnableFullscreenAppList) && |
- app_list::switches::IsExperimentalAppListEnabled(); |
-#else |
- return false; |
-#endif |
-} |
- |
-} // namespace |
- |
-//////////////////////////////////////////////////////////////////////////////// |
-// AppListShowerDelegate, public: |
- |
-AppListShowerDelegate::AppListShowerDelegate( |
- app_list::AppListShower* shower, |
- AppListViewDelegateFactory* view_delegate_factory) |
- : shower_(shower), view_delegate_factory_(view_delegate_factory) { |
- Shell::GetInstance()->AddShellObserver(this); |
-} |
- |
-AppListShowerDelegate::~AppListShowerDelegate() { |
- DCHECK(view_); |
- keyboard::KeyboardController* keyboard_controller = |
- keyboard::KeyboardController::GetInstance(); |
- if (keyboard_controller) |
- keyboard_controller->RemoveObserver(this); |
- views::Widget* widget = view_->GetWidget(); |
- Shell::GetInstance()->RemovePreTargetHandler(this); |
- Shelf::ForWindow(widget->GetNativeWindow())->RemoveIconObserver(this); |
- Shell::GetInstance()->RemoveShellObserver(this); |
-} |
- |
-app_list::AppListViewDelegate* AppListShowerDelegate::GetViewDelegate() { |
- return view_delegate_factory_->GetDelegate(); |
-} |
- |
-void AppListShowerDelegate::Init(app_list::AppListView* view, |
- aura::Window* root_window, |
- int current_apps_page) { |
- // App list needs to know the new shelf layout in order to calculate its |
- // UI layout when AppListView visibility changes. |
- ash::Shell::GetPrimaryRootWindowController() |
- ->GetShelfLayoutManager() |
- ->UpdateAutoHideState(); |
- view_ = view; |
- aura::Window* container = GetRootWindowController(root_window) |
- ->GetContainer(kShellWindowId_AppListContainer); |
- views::View* applist_button = |
- Shelf::ForWindow(container)->GetAppListButtonView(); |
- is_centered_ = view->ShouldCenterWindow(); |
- bool is_fullscreen = IsFullscreenAppListEnabled() && |
- Shell::GetInstance() |
- ->maximize_mode_controller() |
- ->IsMaximizeModeWindowManagerEnabled(); |
- if (is_fullscreen) { |
- view->InitAsFramelessWindow( |
- container, current_apps_page, |
- ScreenUtil::GetDisplayWorkAreaBoundsInParent(container)); |
- } else if (is_centered_) { |
- // Note: We can't center the app list until we have its dimensions, so we |
- // init at (0, 0) and then reset its anchor point. |
- view->InitAsBubbleAtFixedLocation(container, |
- current_apps_page, |
- gfx::Point(), |
- views::BubbleBorder::FLOAT, |
- true /* border_accepts_events */); |
- // The experimental app list is centered over the display of the app list |
- // button that was pressed (if triggered via keyboard, this is the display |
- // with the currently focused window). |
- view->SetAnchorPoint(GetCenterOfDisplayForView( |
- applist_button, GetMinimumBoundsHeightForAppList(view))); |
- } else { |
- gfx::Rect applist_button_bounds = applist_button->GetBoundsInScreen(); |
- // We need the location of the button within the local screen. |
- applist_button_bounds = ScreenUtil::ConvertRectFromScreen( |
- root_window, |
- applist_button_bounds); |
- view->InitAsBubbleAttachedToAnchor( |
- container, |
- current_apps_page, |
- Shelf::ForWindow(container)->GetAppListButtonView(), |
- GetAnchorPositionOffsetToShelf( |
- applist_button_bounds, |
- Shelf::ForWindow(container)->GetAppListButtonView()->GetWidget()), |
- GetBubbleArrow(container), |
- true /* border_accepts_events */); |
- view->SetArrowPaintType(views::BubbleBorder::PAINT_NONE); |
- } |
- |
- keyboard::KeyboardController* keyboard_controller = |
- keyboard::KeyboardController::GetInstance(); |
- if (keyboard_controller) |
- keyboard_controller->AddObserver(this); |
- Shell::GetInstance()->AddPreTargetHandler(this); |
- views::Widget* widget = view->GetWidget(); |
- Shelf::ForWindow(widget->GetNativeWindow())->AddIconObserver(this); |
- |
- // By setting us as DnD recipient, the app list knows that we can |
- // handle items. |
- view->SetDragAndDropHostOfCurrentAppList( |
- Shelf::ForWindow(root_window)->GetDragAndDropHostForAppList()); |
-} |
- |
-void AppListShowerDelegate::OnShown(aura::Window* root_window) { |
- is_visible_ = true; |
- // Update applist button status when app list visibility is changed. |
- Shelf::ForWindow(root_window)->GetAppListButtonView()->SchedulePaint(); |
-} |
- |
-void AppListShowerDelegate::OnDismissed() { |
- DCHECK(is_visible_); |
- DCHECK(view_); |
- |
- is_visible_ = false; |
- |
- // App list needs to know the new shelf layout in order to calculate its |
- // UI layout when AppListView visibility changes. |
- Shell::GetPrimaryRootWindowController() |
- ->GetShelfLayoutManager() |
- ->UpdateAutoHideState(); |
- |
- // Update applist button status when app list visibility is changed. |
- Shelf::ForWindow(view_->GetWidget()->GetNativeView()) |
- ->GetAppListButtonView() |
- ->SchedulePaint(); |
-} |
- |
-void AppListShowerDelegate::UpdateBounds() { |
- if (!view_ || !is_visible_) |
- return; |
- |
- view_->UpdateBounds(); |
- |
- if (is_centered_) { |
- view_->SetAnchorPoint(GetCenterOfDisplayForView( |
- view_, GetMinimumBoundsHeightForAppList(view_))); |
- } |
-} |
- |
-gfx::Vector2d AppListShowerDelegate::GetVisibilityAnimationOffset( |
- aura::Window* root_window) { |
- DCHECK(Shell::HasInstance()); |
- |
- // App list needs to know the new shelf layout in order to calculate its |
- // UI layout when AppListView visibility changes. |
- Shell::GetPrimaryRootWindowController() |
- ->GetShelfLayoutManager() |
- ->UpdateAutoHideState(); |
- |
- ShelfAlignment shelf_alignment = |
- Shell::GetInstance()->GetShelfAlignment(root_window); |
- switch (shelf_alignment) { |
- case SHELF_ALIGNMENT_BOTTOM: |
- return gfx::Vector2d(0, kAnimationOffset); |
- case SHELF_ALIGNMENT_LEFT: |
- return gfx::Vector2d(-kAnimationOffset, 0); |
- case SHELF_ALIGNMENT_RIGHT: |
- return gfx::Vector2d(kAnimationOffset, 0); |
- } |
- NOTREACHED(); |
- return gfx::Vector2d(); |
-} |
- |
-//////////////////////////////////////////////////////////////////////////////// |
-// AppListShowerDelegate, private: |
- |
-void AppListShowerDelegate::ProcessLocatedEvent(ui::LocatedEvent* event) { |
- if (!view_ || !is_visible_) |
- return; |
- |
- // If the event happened on a menu, then the event should not close the app |
- // list. |
- aura::Window* target = static_cast<aura::Window*>(event->target()); |
- if (target) { |
- RootWindowController* root_controller = |
- GetRootWindowController(target->GetRootWindow()); |
- if (root_controller) { |
- aura::Window* menu_container = |
- root_controller->GetContainer(kShellWindowId_MenuContainer); |
- if (menu_container->Contains(target)) |
- return; |
- aura::Window* keyboard_container = root_controller->GetContainer( |
- kShellWindowId_VirtualKeyboardContainer); |
- if (keyboard_container->Contains(target)) |
- return; |
- } |
- } |
- |
- aura::Window* window = view_->GetWidget()->GetNativeView()->parent(); |
- if (!window->Contains(target) && |
- !app_list::switches::ShouldNotDismissOnBlur()) { |
- shower_->Dismiss(); |
- } |
-} |
- |
-//////////////////////////////////////////////////////////////////////////////// |
-// AppListShowerDelegate, aura::EventFilter implementation: |
- |
-void AppListShowerDelegate::OnMouseEvent(ui::MouseEvent* event) { |
- if (event->type() == ui::ET_MOUSE_PRESSED) |
- ProcessLocatedEvent(event); |
-} |
- |
-void AppListShowerDelegate::OnGestureEvent(ui::GestureEvent* event) { |
- if (event->type() == ui::ET_GESTURE_TAP_DOWN) |
- ProcessLocatedEvent(event); |
-} |
- |
-//////////////////////////////////////////////////////////////////////////////// |
-// AppListShowerDelegate, keyboard::KeyboardControllerObserver implementation: |
- |
-void AppListShowerDelegate::OnKeyboardBoundsChanging( |
- const gfx::Rect& new_bounds) { |
- UpdateBounds(); |
-} |
- |
-//////////////////////////////////////////////////////////////////////////////// |
-// AppListShowerDelegate, ShellObserver implementation: |
-void AppListShowerDelegate::OnShelfAlignmentChanged(aura::Window* root_window) { |
- if (view_) |
- view_->SetBubbleArrow(GetBubbleArrow(view_->GetWidget()->GetNativeView())); |
-} |
- |
-void AppListShowerDelegate::OnMaximizeModeStarted() { |
- // The "fullscreen" app-list is initialized as in a different type of window, |
- // therefore we can't switch between the fullscreen status and the normal |
- // app-list bubble. App-list should be dismissed for the transition between |
- // maximize mode (touch-view mode) and non-maximize mode, otherwise the app |
- // list tries to behave as a bubble which leads to a crash. crbug.com/510062 |
- if (IsFullscreenAppListEnabled() && is_visible_) |
- shower_->Dismiss(); |
-} |
- |
-void AppListShowerDelegate::OnMaximizeModeEnded() { |
- // See the comments of OnMaximizeModeStarted(). |
- if (IsFullscreenAppListEnabled() && is_visible_) |
- shower_->Dismiss(); |
-} |
- |
-//////////////////////////////////////////////////////////////////////////////// |
-// AppListShowerDelegate, ShelfIconObserver implementation: |
- |
-void AppListShowerDelegate::OnShelfIconPositionsChanged() { |
- UpdateBounds(); |
-} |
- |
-} // namespace ash |