Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3186)

Unified Diff: ash/shelf/alternate_app_list_button.cc

Issue 836753005: Deleted ash/shelf/alternate_app_list_button.cc. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shelf/alternate_app_list_button.cc
diff --git a/ash/shelf/alternate_app_list_button.cc b/ash/shelf/alternate_app_list_button.cc
deleted file mode 100644
index 247f506fea0ad48a8b1d08a094762db77d466dff..0000000000000000000000000000000000000000
--- a/ash/shelf/alternate_app_list_button.cc
+++ /dev/null
@@ -1,171 +0,0 @@
-// Copyright 2014 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/shelf/alternate_app_list_button.h"
-
-#include "ash/ash_constants.h"
-#include "ash/ash_switches.h"
-#include "ash/shelf/shelf_button.h"
-#include "ash/shelf/shelf_button_host.h"
-#include "ash/shelf/shelf_item_types.h"
-#include "ash/shelf/shelf_layout_manager.h"
-#include "ash/shelf/shelf_widget.h"
-#include "ash/shell.h"
-#include "grit/ash_resources.h"
-#include "grit/ash_strings.h"
-#include "ui/accessibility/ax_view_state.h"
-#include "ui/base/l10n/l10n_util.h"
-#include "ui/base/resource/resource_bundle.h"
-#include "ui/compositor/layer.h"
-#include "ui/compositor/layer_animation_element.h"
-#include "ui/compositor/layer_animation_sequence.h"
-#include "ui/compositor/scoped_layer_animation_settings.h"
-#include "ui/gfx/canvas.h"
-#include "ui/gfx/image/image_skia_operations.h"
-#include "ui/views/controls/button/image_button.h"
-#include "ui/views/painter.h"
-
-namespace ash {
-// static
-const int AlternateAppListButton::kImageBoundsSize = 7;
-
-
-AlternateAppListButton::AlternateAppListButton(views::ButtonListener* listener,
- ShelfButtonHost* host,
- ShelfWidget* shelf_widget)
- : views::ImageButton(listener),
- host_(host),
- shelf_widget_(shelf_widget) {
- SetAccessibleName(l10n_util::GetStringUTF16(IDS_ASH_SHELF_APP_LIST_TITLE));
- SetSize(gfx::Size(ShelfLayoutManager::kShelfSize,
- ShelfLayoutManager::kShelfSize));
- SetFocusPainter(views::Painter::CreateSolidFocusPainter(
- kFocusBorderColor, gfx::Insets(1, 1, 1, 1)));
-}
-
-AlternateAppListButton::~AlternateAppListButton() {
-}
-
-bool AlternateAppListButton::OnMousePressed(const ui::MouseEvent& event) {
- ImageButton::OnMousePressed(event);
- host_->PointerPressedOnButton(this, ShelfButtonHost::MOUSE, event);
- return true;
-}
-
-void AlternateAppListButton::OnMouseReleased(const ui::MouseEvent& event) {
- ImageButton::OnMouseReleased(event);
- host_->PointerReleasedOnButton(this, ShelfButtonHost::MOUSE, false);
-}
-
-void AlternateAppListButton::OnMouseCaptureLost() {
- host_->PointerReleasedOnButton(this, ShelfButtonHost::MOUSE, true);
- ImageButton::OnMouseCaptureLost();
-}
-
-bool AlternateAppListButton::OnMouseDragged(const ui::MouseEvent& event) {
- ImageButton::OnMouseDragged(event);
- host_->PointerDraggedOnButton(this, ShelfButtonHost::MOUSE, event);
- return true;
-}
-
-void AlternateAppListButton::OnMouseMoved(const ui::MouseEvent& event) {
- ImageButton::OnMouseMoved(event);
- host_->MouseMovedOverButton(this);
-}
-
-void AlternateAppListButton::OnMouseEntered(const ui::MouseEvent& event) {
- ImageButton::OnMouseEntered(event);
- host_->MouseEnteredButton(this);
-}
-
-void AlternateAppListButton::OnMouseExited(const ui::MouseEvent& event) {
- ImageButton::OnMouseExited(event);
- host_->MouseExitedButton(this);
-}
-
-void AlternateAppListButton::OnGestureEvent(ui::GestureEvent* event) {
- switch (event->type()) {
- case ui::ET_GESTURE_SCROLL_BEGIN:
- host_->PointerPressedOnButton(this, ShelfButtonHost::TOUCH, *event);
- event->SetHandled();
- return;
- case ui::ET_GESTURE_SCROLL_UPDATE:
- host_->PointerDraggedOnButton(this, ShelfButtonHost::TOUCH, *event);
- event->SetHandled();
- return;
- case ui::ET_GESTURE_SCROLL_END:
- case ui::ET_SCROLL_FLING_START:
- host_->PointerReleasedOnButton(this, ShelfButtonHost::TOUCH, false);
- event->SetHandled();
- return;
- default:
- ImageButton::OnGestureEvent(event);
- return;
- }
-}
-
-void AlternateAppListButton::OnPaint(gfx::Canvas* canvas) {
- // Call the base class first to paint any background/borders.
- View::OnPaint(canvas);
-
- int background_image_id = 0;
- if (Shell::GetInstance()->GetAppListTargetVisibility()) {
- background_image_id = IDR_AURA_NOTIFICATION_BACKGROUND_PRESSED;
- } else {
- if (shelf_widget_->GetDimsShelf())
- background_image_id = IDR_AURA_NOTIFICATION_BACKGROUND_ON_BLACK;
- else
- background_image_id = IDR_AURA_NOTIFICATION_BACKGROUND_NORMAL;
- }
- ResourceBundle& rb = ResourceBundle::GetSharedInstance();
- const gfx::ImageSkia* background_image =
- rb.GetImageNamed(background_image_id).ToImageSkia();
- const gfx::ImageSkia* forground_image =
- rb.GetImageNamed(IDR_ASH_SHELF_ICON_APPLIST_ALTERNATE).ToImageSkia();
-
- gfx::Rect contents_bounds = GetContentsBounds();
- gfx::Rect background_bounds, forground_bounds;
-
- ShelfAlignment alignment = shelf_widget_->GetAlignment();
- background_bounds.set_size(background_image->size());
- if (alignment == SHELF_ALIGNMENT_LEFT) {
- background_bounds.set_x(contents_bounds.width() -
- ShelfLayoutManager::kShelfItemInset - background_image->width());
- background_bounds.set_y(contents_bounds.y() +
- (contents_bounds.height() - background_image->height()) / 2);
- } else if(alignment == SHELF_ALIGNMENT_RIGHT) {
- background_bounds.set_x(ShelfLayoutManager::kShelfItemInset);
- background_bounds.set_y(contents_bounds.y() +
- (contents_bounds.height() - background_image->height()) / 2);
- } else {
- background_bounds.set_y(ShelfLayoutManager::kShelfItemInset);
- background_bounds.set_x(contents_bounds.x() +
- (contents_bounds.width() - background_image->width()) / 2);
- }
-
- forground_bounds.set_size(forground_image->size());
- forground_bounds.set_x(background_bounds.x() +
- std::max(0,
- (background_bounds.width() - forground_bounds.width()) / 2));
- forground_bounds.set_y(background_bounds.y() +
- std::max(0,
- (background_bounds.height() - forground_bounds.height()) / 2));
-
- canvas->DrawImageInt(*background_image,
- background_bounds.x(),
- background_bounds.y());
- canvas->DrawImageInt(*forground_image,
- forground_bounds.x(),
- forground_bounds.y());
-
- views::Painter::PaintFocusPainter(this, canvas, focus_painter());
-}
-
-void AlternateAppListButton::GetAccessibleState(
- ui::AXViewState* state) {
- state->role = ui::AX_ROLE_BUTTON;
- state->name = host_->GetAccessibleName(this);
-}
-
-} // namespace ash
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698