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

Unified Diff: ui/aura/window.h

Issue 810033010: Remove TransparentActivateWindowButton from Overview Mode (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
Index: ui/aura/window.h
diff --git a/ui/aura/window.h b/ui/aura/window.h
index dbd2d2b3e44cff9c65b6df37b33ae35ca015da24..da0e902b3df18221691b0b37408f604c86b25b5c 100644
--- a/ui/aura/window.h
+++ b/ui/aura/window.h
@@ -318,6 +318,9 @@ class AURA_EXPORT Window : public ui::LayerDelegate,
// Overridden from ui::LayerDelegate:
void OnDeviceScaleFactorChanged(float device_scale_factor) override;
+ // Overridden from ui::EventTarget:
Nina 2015/01/09 15:43:49 Moving this to public is needed for the new code t
+ ui::EventTargeter* GetEventTargeter() override;
+
#if !defined(NDEBUG)
// These methods are useful when debugging.
std::string GetDebugInfo() const;
@@ -467,7 +470,6 @@ class AURA_EXPORT Window : public ui::LayerDelegate,
bool CanAcceptEvent(const ui::Event& event) override;
EventTarget* GetParentTarget() override;
scoped_ptr<ui::EventTargetIterator> GetChildIterator() const override;
- ui::EventTargeter* GetEventTargeter() override;
void ConvertEventToTarget(ui::EventTarget* target,
ui::LocatedEvent* event) override;

Powered by Google App Engine
This is Rietveld 408576698