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

Side by Side Diff: chrome/browser/android/logo_bridge.cc

Issue 884213005: Update {virtual,override,final} to follow C++11 style. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 5 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "chrome/browser/android/logo_bridge.h" 5 #include "chrome/browser/android/logo_bridge.h"
6 6
7 #include <jni.h> 7 #include <jni.h>
8 8
9 #include "base/android/jni_android.h" 9 #include "base/android/jni_android.h"
10 #include "base/android/jni_string.h" 10 #include "base/android/jni_string.h"
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 46
47 class LogoObserverAndroid : public search_provider_logos::LogoObserver { 47 class LogoObserverAndroid : public search_provider_logos::LogoObserver {
48 public: 48 public:
49 LogoObserverAndroid(base::WeakPtr<LogoBridge> logo_bridge, 49 LogoObserverAndroid(base::WeakPtr<LogoBridge> logo_bridge,
50 JNIEnv* env, 50 JNIEnv* env,
51 jobject j_logo_observer) 51 jobject j_logo_observer)
52 : logo_bridge_(logo_bridge) { 52 : logo_bridge_(logo_bridge) {
53 j_logo_observer_.Reset(env, j_logo_observer); 53 j_logo_observer_.Reset(env, j_logo_observer);
54 } 54 }
55 55
56 virtual ~LogoObserverAndroid() {} 56 ~LogoObserverAndroid() override {}
57 57
58 // seach_provider_logos::LogoObserver: 58 // seach_provider_logos::LogoObserver:
59 virtual void OnLogoAvailable(const search_provider_logos::Logo* logo, 59 void OnLogoAvailable(const search_provider_logos::Logo* logo,
60 bool from_cache) override { 60 bool from_cache) override {
61 if (!logo_bridge_) 61 if (!logo_bridge_)
62 return; 62 return;
63 63
64 JNIEnv* env = base::android::AttachCurrentThread(); 64 JNIEnv* env = base::android::AttachCurrentThread();
65 ScopedJavaLocalRef<jobject> j_logo = ConvertLogoToJavaObject(env, logo); 65 ScopedJavaLocalRef<jobject> j_logo = ConvertLogoToJavaObject(env, logo);
66 Java_LogoObserver_onLogoAvailable( 66 Java_LogoObserver_onLogoAvailable(
67 env, j_logo_observer_.obj(), j_logo.obj(), from_cache); 67 env, j_logo_observer_.obj(), j_logo.obj(), from_cache);
68 } 68 }
69 69
70 virtual void OnObserverRemoved() override { 70 void OnObserverRemoved() override { delete this; }
71 delete this;
72 }
73 71
74 private: 72 private:
75 // The associated LogoBridge. We won't call back to Java if the LogoBridge has 73 // The associated LogoBridge. We won't call back to Java if the LogoBridge has
76 // been destroyed. 74 // been destroyed.
77 base::WeakPtr<LogoBridge> logo_bridge_; 75 base::WeakPtr<LogoBridge> logo_bridge_;
78 76
79 base::android::ScopedJavaGlobalRef<jobject> j_logo_observer_; 77 base::android::ScopedJavaGlobalRef<jobject> j_logo_observer_;
80 }; 78 };
81 79
82 } // namespace 80 } // namespace
(...skipping 24 matching lines...) Expand all
107 // |observer| is deleted in LogoObserverAndroid::OnObserverRemoved(). 105 // |observer| is deleted in LogoObserverAndroid::OnObserverRemoved().
108 LogoObserverAndroid* observer = new LogoObserverAndroid( 106 LogoObserverAndroid* observer = new LogoObserverAndroid(
109 weak_ptr_factory_.GetWeakPtr(), env, j_logo_observer); 107 weak_ptr_factory_.GetWeakPtr(), env, j_logo_observer);
110 logo_service_->GetLogo(observer); 108 logo_service_->GetLogo(observer);
111 } 109 }
112 110
113 // static 111 // static
114 bool RegisterLogoBridge(JNIEnv* env) { 112 bool RegisterLogoBridge(JNIEnv* env) {
115 return RegisterNativesImpl(env); 113 return RegisterNativesImpl(env);
116 } 114 }
OLDNEW
« no previous file with comments | « chrome/browser/android/intercept_download_resource_throttle.h ('k') | chrome/browser/android/logo_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698