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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/browser/android/browser_jni_registrar.cc

Issue 356873002: battery-status: Implement the battery-status API for chromeos. (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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | content/browser/battery_status/battery_status_browsertest.cc » ('j') | content/browser/battery_status/battery_status_manager.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/android/browser_jni_registrar.cc
diff --git a/content/browser/android/browser_jni_registrar.cc b/content/browser/android/browser_jni_registrar.cc
index 47ff5d1dd47f5c4c2067ebcb2ab7a4b299b64c6b..e4cf0b9c2dc6806265c31347a3b471fb4589b570 100644
--- a/content/browser/android/browser_jni_registrar.cc
+++ b/content/browser/android/browser_jni_registrar.cc
@@ -23,7 +23,7 @@
#include "content/browser/android/surface_texture_peer_browser_impl.h"
#include "content/browser/android/tracing_controller_android.h"
#include "content/browser/android/web_contents_observer_android.h"
-#include "content/browser/battery_status/battery_status_manager.h"
+#include "content/browser/battery_status/battery_status_manager_android.h"
#include "content/browser/device_sensors/sensor_manager_android.h"
#include "content/browser/frame_host/navigation_controller_android.h"
#include "content/browser/gamepad/gamepad_platform_data_fetcher_android.h"
@@ -47,8 +47,7 @@ namespace {
base::android::RegistrationMethod kContentRegisteredMethods[] = {
{"AndroidLocationApiAdapter",
content::AndroidLocationApiAdapter::RegisterGeolocationService},
- {"BatteryStatusManager",
- content::BatteryStatusManager::Register},
+ {"BatteryStatusManager", content::BatteryStatusManagerAndroid::Register},
{"BrowserAccessibilityManager",
content::RegisterBrowserAccessibilityManager},
{"BrowserStartupController", content::RegisterBrowserStartupController},
« no previous file with comments | « no previous file | content/browser/battery_status/battery_status_browsertest.cc » ('j') | content/browser/battery_status/battery_status_manager.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698