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

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

Issue 19746: Remove old web app code it's no longer needed. Simplifies startup a little. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 10 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
OLDNEW
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 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 "build/build_config.h" 5 #include "build/build_config.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/field_trial.h" 10 #include "base/field_trial.h"
(...skipping 529 matching lines...) Expand 10 before | Expand all | Expand 10 after
540 #endif 540 #endif
541 541
542 HandleErrorTestParameters(parsed_command_line); 542 HandleErrorTestParameters(parsed_command_line);
543 543
544 RecordBreakpadStatusUMA(metrics); 544 RecordBreakpadStatusUMA(metrics);
545 545
546 int result_code = ResultCodes::NORMAL_EXIT; 546 int result_code = ResultCodes::NORMAL_EXIT;
547 if (parameters.ui_task) { 547 if (parameters.ui_task) {
548 MessageLoopForUI::current()->PostTask(FROM_HERE, parameters.ui_task); 548 MessageLoopForUI::current()->PostTask(FROM_HERE, parameters.ui_task);
549 RunUIMessageLoop(browser_process.get()); 549 RunUIMessageLoop(browser_process.get());
550 } else if (BrowserInit::ProcessCommandLine(std::wstring(), local_state, true, 550 } else if (BrowserInit::ProcessCommandLine(parsed_command_line,
551 std::wstring(), local_state, true,
551 profile, &result_code)) { 552 profile, &result_code)) {
552 RunUIMessageLoop(browser_process.get()); 553 RunUIMessageLoop(browser_process.get());
553 } 554 }
554 555
555 Platform::WillTerminate(); 556 Platform::WillTerminate();
556 557
557 if (metrics) 558 if (metrics)
558 metrics->Stop(); 559 metrics->Stop();
559 560
560 // browser_shutdown takes care of deleting browser_process, so we need to 561 // browser_shutdown takes care of deleting browser_process, so we need to
561 // release it. 562 // release it.
562 browser_process.release(); 563 browser_process.release();
563 browser_shutdown::Shutdown(); 564 browser_shutdown::Shutdown();
564 565
565 return result_code; 566 return result_code;
566 } 567 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698