| Index: ui/views/widget/android/android_focus_rules.cc
|
| diff --git a/third_party/WebKit/Source/modules/canvas2d/TouchHitRegion.h b/ui/views/widget/android/android_focus_rules.cc
|
| similarity index 44%
|
| copy from third_party/WebKit/Source/modules/canvas2d/TouchHitRegion.h
|
| copy to ui/views/widget/android/android_focus_rules.cc
|
| index 42eb2ec08c29c71cb56046a1148b90487dfd7a13..c01ace9ca58af9f1e1cc6116ca25e1b31a69cf9d 100644
|
| --- a/third_party/WebKit/Source/modules/canvas2d/TouchHitRegion.h
|
| +++ b/ui/views/widget/android/android_focus_rules.cc
|
| @@ -2,22 +2,18 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef TouchHitRegion_h
|
| -#define TouchHitRegion_h
|
| +#include "ui/views/widget/android/android_focus_rules.h"
|
|
|
| -#include "modules/canvas2d/EventHitRegion.h"
|
| -#include "wtf/Allocator.h"
|
| +#include "ui/aura/window.h"
|
|
|
| -namespace blink {
|
| +namespace views {
|
|
|
| -class Touch;
|
| +AndroidFocusRules::AndroidFocusRules() {}
|
|
|
| -class TouchHitRegion : public EventHitRegion {
|
| - STATIC_ONLY(TouchHitRegion);
|
| -public:
|
| - static String region(Touch&);
|
| -};
|
| +AndroidFocusRules::~AndroidFocusRules() {}
|
|
|
| -} // namespace blink
|
| +bool AndroidFocusRules::SupportsChildActivation(aura::Window* window) const {
|
| + return window->IsRootWindow();
|
| +}
|
|
|
| -#endif
|
| +} // namespace views
|
|
|