Merge 114213 - Fixes for the kWasRestarted pref.

chrome/browser/ui/browser.cc

 // Copyright (c) 2011 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.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #include <shellapi.h>
 #endif  // OS_WIN
@@ skipping 1768 matching lines @@
   }
 }
 
 void Browser::ShowKeyboardOverlay() {
   window_->ShowKeyboardOverlay(window_->GetNativeHandle());
 }
 #endif
 
 void Browser::Exit() {
   UserMetrics::RecordAction(UserMetricsAction("Exit"));
-  BrowserList::AttemptUserExit(false);
+  BrowserList::AttemptUserExit();
 }
 
 void Browser::BookmarkCurrentPage() {
   UserMetrics::RecordAction(UserMetricsAction("Star"));
 
   BookmarkModel* model = profile()->GetBookmarkModel();
   if (!model || !model->IsLoaded())
     return;  // Ignore requests until bookmarks are loaded.
 
   GURL url;
@@ skipping 3525 matching lines @@
     window_->GetLocationBar()->ShowFirstRunBubble(bubble_type);
   } else {
     GlobalErrorService* service =
         GlobalErrorServiceFactory::GetForProfile(profile());
     GlobalError* error = service->GetFirstGlobalErrorWithBubbleView();
     if (error) {
       error->ShowBubbleView(this);
     }
   }
 }