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

Side by Side Diff: content/browser/battery_status/battery_status_manager_android.h

Issue 633543002: Replace OVERRIDE and FINAL with override and final in content/browser/battery_status[a-s]* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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 "base/android/scoped_java_ref.h" 5 #include "base/android/scoped_java_ref.h"
6 #include "base/macros.h" 6 #include "base/macros.h"
7 #include "content/browser/battery_status/battery_status_manager.h" 7 #include "content/browser/battery_status/battery_status_manager.h"
8 8
9 #ifndef CHROME_BROWSER_BATTERY_STATUS_BATTERY_STATUS_MANAGER_ANDROID_H_ 9 #ifndef CHROME_BROWSER_BATTERY_STATUS_BATTERY_STATUS_MANAGER_ANDROID_H_
10 #define CHROME_BROWSER_BATTERY_STATUS_BATTERY_STATUS_MANAGER_ANDROID_H_ 10 #define CHROME_BROWSER_BATTERY_STATUS_BATTERY_STATUS_MANAGER_ANDROID_H_
(...skipping 12 matching lines...) Expand all
23 // Called from Java via JNI. 23 // Called from Java via JNI.
24 void GotBatteryStatus(JNIEnv*, 24 void GotBatteryStatus(JNIEnv*,
25 jobject, 25 jobject,
26 jboolean charging, 26 jboolean charging,
27 jdouble charging_time, 27 jdouble charging_time,
28 jdouble discharging_time, 28 jdouble discharging_time,
29 jdouble level); 29 jdouble level);
30 30
31 private: 31 private:
32 // BatteryStatusManager: 32 // BatteryStatusManager:
33 virtual bool StartListeningBatteryChange() OVERRIDE; 33 virtual bool StartListeningBatteryChange() override;
34 virtual void StopListeningBatteryChange() OVERRIDE; 34 virtual void StopListeningBatteryChange() override;
35 35
36 BatteryStatusService::BatteryUpdateCallback callback_; 36 BatteryStatusService::BatteryUpdateCallback callback_;
37 // Java provider of battery status info. 37 // Java provider of battery status info.
38 base::android::ScopedJavaGlobalRef<jobject> j_manager_; 38 base::android::ScopedJavaGlobalRef<jobject> j_manager_;
39 39
40 DISALLOW_COPY_AND_ASSIGN(BatteryStatusManagerAndroid); 40 DISALLOW_COPY_AND_ASSIGN(BatteryStatusManagerAndroid);
41 }; 41 };
42 42
43 } // namespace content 43 } // namespace content
44 44
45 #endif // CHROME_BROWSER_BATTERY_STATUS_BATTERY_STATUS_MANAGER_ANDROID_H_ 45 #endif // CHROME_BROWSER_BATTERY_STATUS_BATTERY_STATUS_MANAGER_ANDROID_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698