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

Side by Side Diff: chrome/browser/browser_main.cc

Issue 201121: Chrome should shut down cleanly when quit from the Dock icon menu, during... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 11 years, 3 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 | Annotate | Revision Log
« no previous file with comments | « chrome/browser/browser_main.h ('k') | chrome/browser/browser_main_gtk.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2006-2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2009 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 "chrome/browser/browser_main.h" 5 #include "chrome/browser/browser_main.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "app/l10n_util.h" 9 #include "app/l10n_util.h"
10 #include "app/resource_bundle.h" 10 #include "app/resource_bundle.h"
(...skipping 818 matching lines...) Expand 10 before | Expand all | Expand 10 after
829 // Call Recycle() here as late as possible, before going into the loop 829 // Call Recycle() here as late as possible, before going into the loop
830 // because Start() will add things to it while creating the main window. 830 // because Start() will add things to it while creating the main window.
831 if (pool) 831 if (pool)
832 pool->Recycle(); 832 pool->Recycle();
833 RunUIMessageLoop(browser_process.get()); 833 RunUIMessageLoop(browser_process.get());
834 } 834 }
835 } 835 }
836 836
837 process_singleton.Cleanup(); 837 process_singleton.Cleanup();
838 838
839 Platform::WillTerminate(); 839 Platform::DidEndMainMessageLoop();
840 840
841 if (metrics) 841 if (metrics)
842 metrics->Stop(); 842 metrics->Stop();
843 843
844 // browser_shutdown takes care of deleting browser_process, so we need to 844 // browser_shutdown takes care of deleting browser_process, so we need to
845 // release it. 845 // release it.
846 browser_process.release(); 846 browser_process.release();
847 browser_shutdown::Shutdown(); 847 browser_shutdown::Shutdown();
848 848
849 return result_code; 849 return result_code;
850 } 850 }
OLDNEW
« no previous file with comments | « chrome/browser/browser_main.h ('k') | chrome/browser/browser_main_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698