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

Unified Diff: ash/common/system/chromeos/virtual_keyboard/virtual_keyboard_tray.h

Issue 2734653002: chromeos: Move files in //ash/common to //ash (Closed)
Patch Set: fix a11y tests, fix docs Created 3 years, 10 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/common/system/chromeos/virtual_keyboard/virtual_keyboard_tray.h
diff --git a/ash/common/system/chromeos/virtual_keyboard/virtual_keyboard_tray.h b/ash/common/system/chromeos/virtual_keyboard/virtual_keyboard_tray.h
deleted file mode 100644
index 9a818eec588b00e2606a1183ae5e794b27dfcea6..0000000000000000000000000000000000000000
--- a/ash/common/system/chromeos/virtual_keyboard/virtual_keyboard_tray.h
+++ /dev/null
@@ -1,59 +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.
-
-#ifndef ASH_COMMON_SYSTEM_CHROMEOS_VIRTUAL_KEYBOARD_VIRTUAL_KEYBOARD_TRAY_H_
-#define ASH_COMMON_SYSTEM_CHROMEOS_VIRTUAL_KEYBOARD_VIRTUAL_KEYBOARD_TRAY_H_
-
-#include "ash/common/keyboard/keyboard_ui_observer.h"
-#include "ash/common/system/tray/tray_background_view.h"
-#include "base/macros.h"
-#include "ui/keyboard/keyboard_controller_observer.h"
-
-namespace views {
-class ImageView;
-}
-
-namespace ash {
-
-// TODO(sky): make this visible on non-chromeos platforms.
-class VirtualKeyboardTray : public TrayBackgroundView,
- public KeyboardUIObserver,
- public keyboard::KeyboardControllerObserver {
- public:
- explicit VirtualKeyboardTray(WmShelf* wm_shelf);
- ~VirtualKeyboardTray() override;
-
- // TrayBackgroundView:
- void SetShelfAlignment(ShelfAlignment alignment) override;
- base::string16 GetAccessibleNameForTray() override;
- void HideBubbleWithView(const views::TrayBubbleView* bubble_view) override;
- void ClickedOutsideBubble() override;
- bool PerformAction(const ui::Event& event) override;
-
- // KeyboardUIObserver:
- void OnKeyboardEnabledStateChanged(bool new_enabled) override;
-
- // keyboard::KeyboardControllerObserver:
- void OnKeyboardBoundsChanging(const gfx::Rect& new_bounds) override;
- void OnKeyboardClosed() override;
-
- private:
- // Creates a new border for the icon. The padding is determined based on the
- // alignment of the shelf.
- void SetIconBorderForShelfAlignment();
-
- void ObserveKeyboardController();
- void UnobserveKeyboardController();
-
- // Weak pointer, will be parented by TrayContainer for its lifetime.
- views::ImageView* icon_;
-
- WmShelf* wm_shelf_;
-
- DISALLOW_COPY_AND_ASSIGN(VirtualKeyboardTray);
-};
-
-} // namespace ash
-
-#endif // ASH_COMMON_SYSTEM_CHROMEOS_VIRTUAL_KEYBOARD_VIRTUAL_KEYBOARD_TRAY_H_

Powered by Google App Engine
This is Rietveld 408576698