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

Side by Side Diff: device/power_save_blocker/power_save_blocker_android.cc

Issue 2279313005: Revert of Let PowerSaveBlocker manager anchor view in Java side (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 unified diff | Download patch
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 #include "device/power_save_blocker/power_save_blocker.h" 5 #include "device/power_save_blocker/power_save_blocker.h"
6 6
7 #include "base/android/jni_android.h" 7 #include "base/android/jni_android.h"
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "base/location.h" 9 #include "base/location.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 17 matching lines...) Expand all
28 void RemoveBlock(); 28 void RemoveBlock();
29 29
30 private: 30 private:
31 friend class base::RefCountedThreadSafe<Delegate>; 31 friend class base::RefCountedThreadSafe<Delegate>;
32 ~Delegate(); 32 ~Delegate();
33 33
34 base::WeakPtr<ui::ViewAndroid> view_android_; 34 base::WeakPtr<ui::ViewAndroid> view_android_;
35 35
36 base::android::ScopedJavaGlobalRef<jobject> java_power_save_blocker_; 36 base::android::ScopedJavaGlobalRef<jobject> java_power_save_blocker_;
37 37
38 ui::ViewAndroid::ScopedAnchorView anchor_view_;
39
38 scoped_refptr<base::SequencedTaskRunner> ui_task_runner_; 40 scoped_refptr<base::SequencedTaskRunner> ui_task_runner_;
39 41
40 DISALLOW_COPY_AND_ASSIGN(Delegate); 42 DISALLOW_COPY_AND_ASSIGN(Delegate);
41 }; 43 };
42 44
43 PowerSaveBlocker::Delegate::Delegate( 45 PowerSaveBlocker::Delegate::Delegate(
44 base::WeakPtr<ui::ViewAndroid> view_android, 46 base::WeakPtr<ui::ViewAndroid> view_android,
45 scoped_refptr<base::SequencedTaskRunner> ui_task_runner) 47 scoped_refptr<base::SequencedTaskRunner> ui_task_runner)
46 : view_android_(view_android), ui_task_runner_(ui_task_runner) { 48 : view_android_(view_android), ui_task_runner_(ui_task_runner) {
47 JNIEnv* env = AttachCurrentThread(); 49 JNIEnv* env = AttachCurrentThread();
48 java_power_save_blocker_.Reset(Java_PowerSaveBlocker_create(env)); 50 java_power_save_blocker_.Reset(Java_PowerSaveBlocker_create(env));
49 } 51 }
50 52
51 PowerSaveBlocker::Delegate::~Delegate() {} 53 PowerSaveBlocker::Delegate::~Delegate() {}
52 54
53 void PowerSaveBlocker::Delegate::ApplyBlock() { 55 void PowerSaveBlocker::Delegate::ApplyBlock() {
54 DCHECK(ui_task_runner_->RunsTasksOnCurrentThread()); 56 DCHECK(ui_task_runner_->RunsTasksOnCurrentThread());
55 57
56 if (!view_android_) 58 if (!view_android_)
57 return; 59 return;
58 60
59 JNIEnv* env = AttachCurrentThread(); 61 JNIEnv* env = AttachCurrentThread();
60 ScopedJavaLocalRef<jobject> delegate = 62 anchor_view_ = view_android_->AcquireAnchorView();
61 view_android_->GetViewAndroidDelegate().get(env); 63 const ScopedJavaLocalRef<jobject> popup_view = anchor_view_.view();
62 if (delegate.is_null()) 64 if (popup_view.is_null())
63 return; 65 return;
64 ScopedJavaLocalRef<jobject> obj(java_power_save_blocker_); 66 ScopedJavaLocalRef<jobject> obj(java_power_save_blocker_);
65 Java_PowerSaveBlocker_applyBlock(env, obj, delegate); 67 Java_PowerSaveBlocker_applyBlock(env, obj, popup_view);
66 } 68 }
67 69
68 void PowerSaveBlocker::Delegate::RemoveBlock() { 70 void PowerSaveBlocker::Delegate::RemoveBlock() {
69 DCHECK(ui_task_runner_->RunsTasksOnCurrentThread()); 71 DCHECK(ui_task_runner_->RunsTasksOnCurrentThread());
70 ScopedJavaLocalRef<jobject> obj(java_power_save_blocker_); 72 ScopedJavaLocalRef<jobject> obj(java_power_save_blocker_);
71 Java_PowerSaveBlocker_removeBlock(AttachCurrentThread(), obj); 73 Java_PowerSaveBlocker_removeBlock(AttachCurrentThread(), obj);
74 anchor_view_.Reset();
72 } 75 }
73 76
74 PowerSaveBlocker::PowerSaveBlocker( 77 PowerSaveBlocker::PowerSaveBlocker(
75 PowerSaveBlockerType type, 78 PowerSaveBlockerType type,
76 Reason reason, 79 Reason reason,
77 const std::string& description, 80 const std::string& description,
78 scoped_refptr<base::SequencedTaskRunner> ui_task_runner, 81 scoped_refptr<base::SequencedTaskRunner> ui_task_runner,
79 scoped_refptr<base::SingleThreadTaskRunner> blocking_task_runner) 82 scoped_refptr<base::SingleThreadTaskRunner> blocking_task_runner)
80 : ui_task_runner_(ui_task_runner), 83 : ui_task_runner_(ui_task_runner),
81 blocking_task_runner_(blocking_task_runner) { 84 blocking_task_runner_(blocking_task_runner) {
(...skipping 11 matching lines...) Expand all
93 const base::WeakPtr<ui::ViewAndroid>& view_android) { 96 const base::WeakPtr<ui::ViewAndroid>& view_android) {
94 DCHECK(ui_task_runner_->RunsTasksOnCurrentThread()); 97 DCHECK(ui_task_runner_->RunsTasksOnCurrentThread());
95 if (!view_android) 98 if (!view_android)
96 return; 99 return;
97 100
98 delegate_ = new Delegate(view_android, ui_task_runner_); 101 delegate_ = new Delegate(view_android, ui_task_runner_);
99 delegate_->ApplyBlock(); 102 delegate_->ApplyBlock();
100 } 103 }
101 104
102 } // namespace device 105 } // namespace device
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698