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

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

Issue 501011: Speculative fix for a chrome browser crash which occurs with ChromeFrame. Bas... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years 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/app/chrome_dll_main.cc ('k') | chrome/browser/browser_main_win.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/hi_res_timer_manager.h" 9 #include "app/hi_res_timer_manager.h"
10 #include "app/l10n_util.h" 10 #include "app/l10n_util.h"
(...skipping 961 matching lines...) Expand 10 before | Expand all | Expand 10 after
972 // because Start() will add things to it while creating the main window. 972 // because Start() will add things to it while creating the main window.
973 if (pool) 973 if (pool)
974 pool->Recycle(); 974 pool->Recycle();
975 RunUIMessageLoop(browser_process.get()); 975 RunUIMessageLoop(browser_process.get());
976 } 976 }
977 } 977 }
978 chrome_browser_net_websocket_experiment::WebSocketExperimentRunner::Stop(); 978 chrome_browser_net_websocket_experiment::WebSocketExperimentRunner::Stop();
979 979
980 process_singleton.Cleanup(); 980 process_singleton.Cleanup();
981 981
982 Platform::DidEndMainMessageLoop();
983
984 if (metrics) 982 if (metrics)
985 metrics->Stop(); 983 metrics->Stop();
986 984
987 // browser_shutdown takes care of deleting browser_process, so we need to 985 // browser_shutdown takes care of deleting browser_process, so we need to
988 // release it. 986 // release it.
989 browser_process.release(); 987 browser_process.release();
990 browser_shutdown::Shutdown(); 988 browser_shutdown::Shutdown();
991 989
992 return result_code; 990 return result_code;
993 } 991 }
OLDNEW
« no previous file with comments | « chrome/app/chrome_dll_main.cc ('k') | chrome/browser/browser_main_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698