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

Unified Diff: chrome/browser/lifetime/application_lifetime_android.cc

Issue 11633020: Re-enable about:flags on Android (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Adding excluded files Created 7 years, 11 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
Index: chrome/browser/lifetime/application_lifetime_android.cc
diff --git a/chrome/browser/lifetime/application_lifetime_android.cc b/chrome/browser/lifetime/application_lifetime_android.cc
new file mode 100644
index 0000000000000000000000000000000000000000..f385cd79f8ebe9e958d1228aad01a259db8524e9
--- /dev/null
+++ b/chrome/browser/lifetime/application_lifetime_android.cc
@@ -0,0 +1,46 @@
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "chrome/browser/lifetime/application_lifetime_android.h"
+
+#include <jni.h>
+
+#include "base/android/jni_android.h"
+#include "base/logging.h"
+#include "chrome/browser/browser_process.h"
+#include "chrome/browser/lifetime/application_lifetime.h"
+#include "chrome/browser/prefs/pref_service.h"
+#include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/browser_list.h"
+#include "chrome/common/pref_names.h"
+#include "content/public/browser/browser_context.h"
+#include "jni/ApplicationLifetime_jni.h"
+
+namespace browser {
+
+void AttemptRestart() {
+ // Set the flag to restart Chrome after it is shutdown.
+ PrefService* pref_service = g_browser_process->local_state();
+ pref_service->SetBoolean(prefs::kRestartLastSessionOnShutdown, true);
+ AttemptExit();
+}
+
+void TerminateAndroid() {
Nico 2013/01/15 20:33:27 Do you have any restart tests (since this code is
gone 2013/01/15 22:18:54 Not yet. Shutting down anything on Android is alr
+ bool restart = false;
+ PrefService* prefs = g_browser_process->local_state();
+ if (prefs->HasPrefPath(prefs::kRestartLastSessionOnShutdown)) {
+ restart = prefs->GetBoolean(prefs::kRestartLastSessionOnShutdown);
+ prefs->ClearPref(prefs::kRestartLastSessionOnShutdown);
+ }
+
+ JNIEnv* env = base::android::AttachCurrentThread();
+ Java_ApplicationLifetime_terminate(env, restart);
+}
+
+bool RegisterApplicationLifetimeAndroid(JNIEnv* env) {
+ return RegisterNativesImpl(env);
+}
+
+} // namespace browser

Powered by Google App Engine
This is Rietveld 408576698