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

Unified Diff: ash/system/ime/tray_ime_chromeos.h

Issue 2086503003: mash: Migrate tray IME view to wm common types, move to //ash/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@movea11y
Patch Set: nit 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
« no previous file with comments | « ash/system/ime/ime_observer.h ('k') | ash/system/ime/tray_ime_chromeos.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/ime/tray_ime_chromeos.h
diff --git a/ash/system/ime/tray_ime_chromeos.h b/ash/system/ime/tray_ime_chromeos.h
deleted file mode 100644
index 36830251d1d35ca5802d239256466435e3cc4422..0000000000000000000000000000000000000000
--- a/ash/system/ime/tray_ime_chromeos.h
+++ /dev/null
@@ -1,94 +0,0 @@
-// Copyright 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.
-
-#ifndef ASH_SYSTEM_IME_TRAY_IME_CHROMEOS_H_
-#define ASH_SYSTEM_IME_TRAY_IME_CHROMEOS_H_
-
-#include <stddef.h>
-
-#include "ash/common/system/accessibility_observer.h"
-#include "ash/common/system/tray/system_tray_delegate.h"
-#include "ash/common/system/tray/system_tray_item.h"
-#include "ash/system/chromeos/virtual_keyboard/virtual_keyboard_observer.h"
-#include "ash/system/ime/ime_observer.h"
-#include "base/macros.h"
-
-namespace views {
-class Label;
-}
-
-namespace ash {
-struct IMEInfo;
-
-namespace tray {
-class IMEDefaultView;
-class IMEDetailedView;
-class IMENotificationView;
-}
-
-class TrayItemView;
-
-class ASH_EXPORT TrayIME : public SystemTrayItem,
- public IMEObserver,
- public AccessibilityObserver,
- public VirtualKeyboardObserver {
- public:
- explicit TrayIME(SystemTray* system_tray);
- ~TrayIME() override;
-
- // Overridden from VirtualKeyboardObserver.
- void OnKeyboardSuppressionChanged(bool suppressed) override;
-
- // Overridden from AccessibilityObserver:
- void OnAccessibilityModeChanged(
- AccessibilityNotificationVisibility notify) override;
-
- private:
- friend class TrayIMETest;
-
- // Repopulates the DefaultView and DetailedView.
- void Update();
- // Updates the System Tray label.
- void UpdateTrayLabel(const IMEInfo& info, size_t count);
- // Returns whether the virtual keyboard toggle should be shown in the
- // detailed view.
- bool ShouldShowKeyboardToggle();
- // Returns the appropriate label for the detailed view.
- base::string16 GetDefaultViewLabel(bool show_ime_label);
-
- // Overridden from SystemTrayItem.
- views::View* CreateTrayView(LoginStatus status) override;
- views::View* CreateDefaultView(LoginStatus status) override;
- views::View* CreateDetailedView(LoginStatus status) override;
- void DestroyTrayView() override;
- void DestroyDefaultView() override;
- void DestroyDetailedView() override;
- void UpdateAfterLoginStatusChange(LoginStatus status) override;
- void UpdateAfterShelfAlignmentChange(ShelfAlignment alignment) override;
-
- // Overridden from IMEObserver.
- void OnIMERefresh() override;
- void OnIMEMenuActivationChanged(bool is_active) override;
-
- // Whether the default view should be shown.
- bool ShouldDefaultViewBeVisible();
-
- TrayItemView* tray_label_;
- tray::IMEDefaultView* default_;
- tray::IMEDetailedView* detailed_;
- // Whether the virtual keyboard is suppressed.
- bool keyboard_suppressed_;
- // Cached IME info.
- IMEInfoList ime_list_;
- IMEInfo current_ime_;
- IMEPropertyInfoList property_list_;
- // Whether the IME label and tray items should be visible.
- bool is_visible_;
-
- DISALLOW_COPY_AND_ASSIGN(TrayIME);
-};
-
-} // namespace ash
-
-#endif // ASH_SYSTEM_IME_TRAY_IME_CHROMEOS_H_
« no previous file with comments | « ash/system/ime/ime_observer.h ('k') | ash/system/ime/tray_ime_chromeos.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698