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

Side by Side Diff: ui/base/android/window_android.cc

Issue 303293004: Android: Remove WindowAndroidObserver::OnWillDestroyWindow() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 #include "ui/base/android/window_android.h" 5 #include "ui/base/android/window_android.h"
6 6
7 #include "base/android/jni_android.h" 7 #include "base/android/jni_android.h"
8 #include "base/android/jni_array.h" 8 #include "base/android/jni_array.h"
9 #include "base/android/jni_weak_ref.h" 9 #include "base/android/jni_weak_ref.h"
10 #include "base/android/scoped_java_ref.h" 10 #include "base/android/scoped_java_ref.h"
(...skipping 19 matching lines...) Expand all
30 ScopedJavaLocalRef<jobject> WindowAndroid::GetJavaObject() { 30 ScopedJavaLocalRef<jobject> WindowAndroid::GetJavaObject() {
31 return weak_java_window_.get(AttachCurrentThread()); 31 return weak_java_window_.get(AttachCurrentThread());
32 } 32 }
33 33
34 bool WindowAndroid::RegisterWindowAndroid(JNIEnv* env) { 34 bool WindowAndroid::RegisterWindowAndroid(JNIEnv* env) {
35 return RegisterNativesImpl(env); 35 return RegisterNativesImpl(env);
36 } 36 }
37 37
38 WindowAndroid::~WindowAndroid() { 38 WindowAndroid::~WindowAndroid() {
39 DCHECK(!compositor_); 39 DCHECK(!compositor_);
40 FOR_EACH_OBSERVER(
41 WindowAndroidObserver, observer_list_, OnWillDestroyWindow());
42 } 40 }
43 41
44 void WindowAndroid::OnCompositingDidCommit() { 42 void WindowAndroid::OnCompositingDidCommit() {
45 FOR_EACH_OBSERVER(WindowAndroidObserver, 43 FOR_EACH_OBSERVER(WindowAndroidObserver,
46 observer_list_, 44 observer_list_,
47 OnCompositingDidCommit()); 45 OnCompositingDidCommit());
48 } 46 }
49 47
50 void WindowAndroid::AddObserver(WindowAndroidObserver* observer) { 48 void WindowAndroid::AddObserver(WindowAndroidObserver* observer) {
51 if (!observer_list_.HasObserver(observer)) 49 if (!observer_list_.HasObserver(observer))
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
102 // ---------------------------------------------------------------------------- 100 // ----------------------------------------------------------------------------
103 // Native JNI methods 101 // Native JNI methods
104 // ---------------------------------------------------------------------------- 102 // ----------------------------------------------------------------------------
105 103
106 jlong Init(JNIEnv* env, jobject obj, jlong vsync_period) { 104 jlong Init(JNIEnv* env, jobject obj, jlong vsync_period) {
107 WindowAndroid* window = new WindowAndroid(env, obj, vsync_period); 105 WindowAndroid* window = new WindowAndroid(env, obj, vsync_period);
108 return reinterpret_cast<intptr_t>(window); 106 return reinterpret_cast<intptr_t>(window);
109 } 107 }
110 108
111 } // namespace ui 109 } // namespace ui
OLDNEW
« no previous file with comments | « content/browser/renderer_host/render_widget_host_view_android.cc ('k') | ui/base/android/window_android_observer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698