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

Unified Diff: components/exo/shell_surface.h

Issue 2361993003: Draw underlay behind android apps using talkback (Closed)
Patch Set: Resolved merge conflicts Created 4 years, 3 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: components/exo/shell_surface.h
diff --git a/components/exo/shell_surface.h b/components/exo/shell_surface.h
index 2d445c592c85dcdebe93f96eacf862b2f151b460..f8f29e5cd6c2db3785c6a7c44c8bfd8bf3c7bfde 100644
--- a/components/exo/shell_surface.h
+++ b/components/exo/shell_surface.h
@@ -9,6 +9,7 @@
#include <memory>
#include <string>
+#include "ash/common/system/accessibility_observer.h"
#include "ash/common/wm/window_state_observer.h"
#include "base/macros.h"
#include "base/strings/string16.h"
@@ -42,6 +43,7 @@ class ShellSurface : public SurfaceDelegate,
public SurfaceObserver,
public views::WidgetDelegate,
public views::View,
+ public ash::AccessibilityObserver,
public ash::wm::WindowStateObserver,
public aura::WindowObserver,
public WMHelper::ActivationObserver {
@@ -194,6 +196,10 @@ class ShellSurface : public SurfaceDelegate,
// Overridden from views::View:
gfx::Size GetPreferredSize() const override;
+ // Overridden from ash::AccessibilityObserver:
+ void OnAccessibilityModeChanged(
+ ash::AccessibilityNotificationVisibility notify) override;
+
// Overridden from ash::wm::WindowStateObserver:
void OnPreWindowStateTypeChange(ash::wm::WindowState* window_state,
ash::wm::WindowStateType old_type) override;
@@ -218,9 +224,7 @@ class ShellSurface : public SurfaceDelegate,
// Overridden from ui::AcceleratorTarget:
bool AcceleratorPressed(const ui::Accelerator& accelerator) override;
- const aura::Window* shadow_underlay_for_test() const {
- return shadow_underlay_;
- }
+ aura::Window* shadow_underlay() { return shadow_underlay_; }
private:
class ScopedConfigure;
@@ -291,6 +295,7 @@ class ShellSurface : public SurfaceDelegate,
int pending_resize_component_ = HTCAPTION;
aura::Window* shadow_overlay_ = nullptr;
aura::Window* shadow_underlay_ = nullptr;
+ std::unique_ptr<ui::EventHandler> shadow_underlay_handler_;
reveman 2016/09/30 20:51:10 nit: keep "event" in the name, shadow_underlay_eve
gfx::Rect shadow_content_bounds_;
std::deque<Config> pending_configs_;
std::unique_ptr<ash::WindowResizer> resizer_;

Powered by Google App Engine
This is Rietveld 408576698