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

Side by Side Diff: ui/views/widget/native_widget_aura.h

Issue 1639003002: Revert of Introduce AndroidFocusRules and NativeWidgetAndroid (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase plus removing menu_config_android.cc Created 4 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 unified diff | Download patch
« no previous file with comments | « ui/views/widget/android/native_widget_android.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef UI_VIEWS_WIDGET_NATIVE_WIDGET_AURA_H_ 5 #ifndef UI_VIEWS_WIDGET_NATIVE_WIDGET_AURA_H_
6 #define UI_VIEWS_WIDGET_NATIVE_WIDGET_AURA_H_ 6 #define UI_VIEWS_WIDGET_NATIVE_WIDGET_AURA_H_
7 7
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "base/memory/weak_ptr.h" 9 #include "base/memory/weak_ptr.h"
10 #include "ui/aura/client/focus_change_observer.h" 10 #include "ui/aura/client/focus_change_observer.h"
(...skipping 24 matching lines...) Expand all
35 : public internal::NativeWidgetPrivate, 35 : public internal::NativeWidgetPrivate,
36 public aura::WindowDelegate, 36 public aura::WindowDelegate,
37 public aura::WindowObserver, 37 public aura::WindowObserver,
38 public aura::client::ActivationDelegate, 38 public aura::client::ActivationDelegate,
39 public aura::client::ActivationChangeObserver, 39 public aura::client::ActivationChangeObserver,
40 public aura::client::FocusChangeObserver, 40 public aura::client::FocusChangeObserver,
41 public aura::client::DragDropDelegate { 41 public aura::client::DragDropDelegate {
42 public: 42 public:
43 explicit NativeWidgetAura(internal::NativeWidgetDelegate* delegate); 43 explicit NativeWidgetAura(internal::NativeWidgetDelegate* delegate);
44 44
45 // Called internally by NativeWidget implementations to associate 45 // Called internally by NativeWidgetAura and DesktopNativeWidgetAura to
46 // |native_widget| with |window|. 46 // associate |native_widget| with |window|.
47 static void RegisterNativeWidgetForWindow( 47 static void RegisterNativeWidgetForWindow(
48 internal::NativeWidgetPrivate* native_widget, 48 internal::NativeWidgetPrivate* native_widget,
49 aura::Window* window); 49 aura::Window* window);
50 50
51 // Overridden from internal::NativeWidgetPrivate: 51 // Overridden from internal::NativeWidgetPrivate:
52 void InitNativeWidget(const Widget::InitParams& params) override; 52 void InitNativeWidget(const Widget::InitParams& params) override;
53 void OnWidgetInitDone() override; 53 void OnWidgetInitDone() override;
54 NonClientFrameView* CreateNonClientFrameView() override; 54 NonClientFrameView* CreateNonClientFrameView() override;
55 bool ShouldUseNativeFrame() const override; 55 bool ShouldUseNativeFrame() const override;
56 bool ShouldWindowContentsBeTransparent() const override; 56 bool ShouldWindowContentsBeTransparent() const override;
(...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after
226 // The following factory is used for calls to close the NativeWidgetAura 226 // The following factory is used for calls to close the NativeWidgetAura
227 // instance. 227 // instance.
228 base::WeakPtrFactory<NativeWidgetAura> close_widget_factory_; 228 base::WeakPtrFactory<NativeWidgetAura> close_widget_factory_;
229 229
230 DISALLOW_COPY_AND_ASSIGN(NativeWidgetAura); 230 DISALLOW_COPY_AND_ASSIGN(NativeWidgetAura);
231 }; 231 };
232 232
233 } // namespace views 233 } // namespace views
234 234
235 #endif // UI_VIEWS_WIDGET_NATIVE_WIDGET_AURA_H_ 235 #endif // UI_VIEWS_WIDGET_NATIVE_WIDGET_AURA_H_
OLDNEW
« no previous file with comments | « ui/views/widget/android/native_widget_android.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698