Re-enable about:flags on Android

chrome/browser/lifetime/application_lifetime.cc

 // 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/ui/browser_list.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "build/build_config.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_shutdown.h"
 #include "chrome/browser/download/download_service.h"
 #include "chrome/browser/metrics/thread_watcher.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/browser_shutdown.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/navigation_details.h"
 #include "content/public/browser/notification_service.h"
 
+#if defined(OS_ANDROID)
+#include "chrome/browser/lifetime/application_lifetime_android.h"
+#endif
+
 #if defined(OS_MACOSX)
 #include "chrome/browser/chrome_browser_application_mac.h"
 #endif
 
 #if defined(OS_CHROMEOS)
 #include "base/chromeos/chromeos_version.h"
 #include "chrome/browser/chromeos/boot_times_loader.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/session_manager_client.h"
@@ skipping 39 matching lines @@
     (*i)->profile()->SetExitType(Profile::EXIT_NORMAL);
   }
 }
 
 void AttemptExitInternal() {
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_CLOSE_ALL_BROWSERS_REQUEST,
       content::NotificationService::AllSources(),
       content::NotificationService::NoDetails());
 
-#if !defined(OS_MACOSX)
-  // On most platforms, closing all windows causes the application to exit.
-  CloseAllBrowsers();
-#else
+#if defined(OS_ANDROID)
+  // Tell the Java code to finish() the Activity.
+  TerminateAndroid();
+#elif defined(OS_MACOSX)
   // On the Mac, the application continues to run once all windows are closed.
   // Terminate will result in a CloseAllBrowsers() call, and once (and if)
   // that is done, will cause the application to exit cleanly.
   chrome_browser_application_mac::Terminate();
+#else
+  // On most platforms, closing all windows causes the application to exit.
+  CloseAllBrowsers();
 #endif
 }
 
 void NotifyAppTerminating() {
   static bool notified = false;
   if (notified)
     return;
   notified = true;
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_APP_TERMINATING,
@@ skipping 122 matching lines @@
   NotifyAndTerminate(true);
 #else
   // Reset the restart bit that might have been set in cancelled restart
   // request.
   PrefService* pref_service = g_browser_process->local_state();
   pref_service->SetBoolean(prefs::kRestartLastSessionOnShutdown, false);
   AttemptExitInternal();
 #endif
 }
 
+// The Android implementation is in application_lifetime_android.cc
+#if !defined(OS_ANDROID)
 void AttemptRestart() {
   // TODO(beng): Can this use ProfileManager::GetLoadedProfiles instead?
   BrowserList::const_iterator it;
   for (it = BrowserList::begin(); it != BrowserList::end(); ++it)
     content::BrowserContext::SaveSessionState((*it)->profile());
 
   PrefService* pref_service = g_browser_process->local_state();
   pref_service->SetBoolean(prefs::kWasRestarted, true);
 
 #if defined(OS_CHROMEOS)
   // For CrOS instead of browser restart (which is not supported) perform a full
   // sign out. Session will be only restored if user has that setting set.
   // Same session restore behavior happens in case of full restart after update.
   AttemptUserExit();
 #else
   // Set the flag to restore state after the restart.
   pref_service->SetBoolean(prefs::kRestartLastSessionOnShutdown, true);
   AttemptExit();
 #endif
 }
+#endif
 
 #if defined(OS_WIN)
 void AttemptRestartWithModeSwitch() {
   // The kRestartSwitchMode preference does not exists for Windows 7 and older
   // operating systems so there is no need for OS version check.
   PrefService* prefs = g_browser_process->local_state();
   prefs->SetBoolean(prefs::kRestartSwitchMode, true);
   browser::AttemptRestart();
 }
 #endif
 
 void AttemptExit() {
   // If we know that all browsers can be closed without blocking,
   // don't notify users of crashes beyond this point.
   // Note that MarkAsCleanShutdown() does not set UMA's exit cleanly bit
   // so crashes during shutdown are still reported in UMA.
+#if !defined(OS_ANDROID)
+  // Android doesn't use Browser.

[Nico, 2013/01/15 20:33:27]

So you don't need the call to MarkAsCleanShutdown()?

[gone, 2013/01/15 22:18:54]

Yeah, AreAllBrowsersCloseable() goes through a list of Browsers to see if they
need to be marked as cleanly shutting down, but AFAICT we don't use (or even
compile) browser.cc.

The Android-specific code for terminating the app triggers the normal Android
Activity onPause()/onDestroy() pathway, which should mark it as a clean shutdown
on our side after the corresponding internal CL lands.

   if (AreAllBrowsersCloseable())
     MarkAsCleanShutdown();
+#endif
   AttemptExitInternal();
 }
 
 #if defined(OS_CHROMEOS)
 // A function called when SIGTERM is received.
 void ExitCleanly() {
   // We always mark exit cleanly because SessionManager may kill
   // chrome in 3 seconds after SIGTERM.
   g_browser_process->EndSession();
 
@@ skipping 75 matching lines @@
         MessageLoop::current())
       CloseAllBrowsers();
   }
 }
 
 bool WillKeepAlive() {
   return g_keep_alive_count > 0;
 }
 
 }  // namespace browser