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

Unified Diff: ash/system/chromeos/virtual_keyboard/virtual_keyboard_tray.cc

Issue 2103053004: mash: Convert virtual keyboard system tray item to wm common types (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: tweak Created 4 years, 6 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
Index: ash/system/chromeos/virtual_keyboard/virtual_keyboard_tray.cc
diff --git a/ash/system/chromeos/virtual_keyboard/virtual_keyboard_tray.cc b/ash/system/chromeos/virtual_keyboard/virtual_keyboard_tray.cc
deleted file mode 100644
index 38e35fdc878e096366a3ccb0948c81460d45a943..0000000000000000000000000000000000000000
--- a/ash/system/chromeos/virtual_keyboard/virtual_keyboard_tray.cc
+++ /dev/null
@@ -1,106 +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/system/chromeos/virtual_keyboard/virtual_keyboard_tray.h"
-
-#include "ash/common/keyboard/keyboard_ui.h"
-#include "ash/common/material_design/material_design_controller.h"
-#include "ash/common/shelf/shelf_constants.h"
-#include "ash/common/shelf/wm_shelf_util.h"
-#include "ash/common/system/tray/tray_constants.h"
-#include "ash/common/system/tray/tray_utils.h"
-#include "ash/shell.h"
-#include "grit/ash_resources.h"
-#include "grit/ash_strings.h"
-#include "ui/base/l10n/l10n_util.h"
-#include "ui/base/resource/resource_bundle.h"
-#include "ui/events/event.h"
-#include "ui/gfx/image/image_skia.h"
-#include "ui/gfx/paint_vector_icon.h"
-#include "ui/gfx/vector_icons_public.h"
-#include "ui/views/controls/button/image_button.h"
-
-namespace ash {
-
-VirtualKeyboardTray::VirtualKeyboardTray(WmShelf* wm_shelf)
- : TrayBackgroundView(wm_shelf), button_(nullptr) {
- button_ = new views::ImageButton(this);
- if (MaterialDesignController::IsShelfMaterial()) {
- gfx::ImageSkia image_md =
- CreateVectorIcon(gfx::VectorIconId::SHELF_KEYBOARD, kShelfIconColor);
- button_->SetImage(views::CustomButton::STATE_NORMAL, &image_md);
- } else {
- gfx::ImageSkia* image_non_md =
- ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
- IDR_AURA_UBER_TRAY_VIRTUAL_KEYBOARD);
- button_->SetImage(views::CustomButton::STATE_NORMAL, image_non_md);
- }
- button_->SetImageAlignment(views::ImageButton::ALIGN_CENTER,
- views::ImageButton::ALIGN_MIDDLE);
-
- tray_container()->AddChildView(button_);
- button_->SetFocusBehavior(FocusBehavior::NEVER);
- SetContentsBackground();
- // The Shell may not exist in some unit tests.
- if (Shell::HasInstance())
- Shell::GetInstance()->keyboard_ui()->AddObserver(this);
-}
-
-VirtualKeyboardTray::~VirtualKeyboardTray() {
- // The Shell may not exist in some unit tests.
- if (Shell::HasInstance())
- Shell::GetInstance()->keyboard_ui()->RemoveObserver(this);
-}
-
-void VirtualKeyboardTray::SetShelfAlignment(ShelfAlignment alignment) {
- TrayBackgroundView::SetShelfAlignment(alignment);
- tray_container()->SetBorder(views::Border::NullBorder());
-
- // Pad button size to align with other controls in the system tray.
- const gfx::ImageSkia image =
- button_->GetImage(views::CustomButton::STATE_NORMAL);
- int top_padding = (kTrayBarButtonWidth - image.height()) / 2;
- int left_padding = (kTrayBarButtonWidth - image.width()) / 2;
- int bottom_padding = kTrayBarButtonWidth - image.height() - top_padding;
- int right_padding = kTrayBarButtonWidth - image.width() - left_padding;
-
- // Square up the padding if horizontally aligned. Avoid extra padding when
- // vertically aligned as the button would violate the width constraint on the
- // shelf.
- if (IsHorizontalAlignment(alignment)) {
- int additional_padding = std::max(0, top_padding - left_padding);
- left_padding += additional_padding;
- right_padding += additional_padding;
- }
-
- button_->SetBorder(views::Border::CreateEmptyBorder(
- top_padding, left_padding, bottom_padding, right_padding));
-}
-
-base::string16 VirtualKeyboardTray::GetAccessibleNameForTray() {
- return l10n_util::GetStringUTF16(
- IDS_ASH_VIRTUAL_KEYBOARD_TRAY_ACCESSIBLE_NAME);
-}
-
-void VirtualKeyboardTray::HideBubbleWithView(
- const views::TrayBubbleView* bubble_view) {}
-
-void VirtualKeyboardTray::ClickedOutsideBubble() {}
-
-bool VirtualKeyboardTray::PerformAction(const ui::Event& event) {
- Shell::GetInstance()->keyboard_ui()->Show();
- return true;
-}
-
-void VirtualKeyboardTray::ButtonPressed(views::Button* sender,
- const ui::Event& event) {
- DCHECK_EQ(button_, sender);
- PerformAction(event);
-}
-
-void VirtualKeyboardTray::OnKeyboardEnabledStateChanged(bool new_value) {
- SetVisible(Shell::GetInstance()->keyboard_ui()->IsEnabled());
-}
-
-} // namespace ash

Powered by Google App Engine
This is Rietveld 408576698