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

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

Issue 27240: Make startup_tests build and run on Linux (except reference tests). (Closed)
Patch Set: small bugfix in process_util Created 11 years, 9 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
« no previous file with comments | « chrome/browser/browser_init.cc ('k') | chrome/chrome.gyp » ('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-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 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 // other platforms. For now, it's just a stub. This is a serious work in 58 // other platforms. For now, it's just a stub. This is a serious work in
59 // progress and should not be taken as an indication of a real refactoring. 59 // progress and should not be taken as an indication of a real refactoring.
60 60
61 #if defined(OS_WIN) 61 #if defined(OS_WIN)
62 62
63 #include <windows.h> 63 #include <windows.h>
64 #include <shellapi.h> 64 #include <shellapi.h>
65 65
66 #include "base/registry.h" 66 #include "base/registry.h"
67 #include "base/win_util.h" 67 #include "base/win_util.h"
68 #include "chrome/browser/automation/automation_provider.h"
69 #include "chrome/browser/browser.h" 68 #include "chrome/browser/browser.h"
70 #include "chrome/browser/browser_trial.h" 69 #include "chrome/browser/browser_trial.h"
71 #include "chrome/browser/extensions/extension_protocols.h" 70 #include "chrome/browser/extensions/extension_protocols.h"
72 #include "chrome/browser/jankometer.h" 71 #include "chrome/browser/jankometer.h"
73 #include "chrome/browser/metrics/user_metrics.h" 72 #include "chrome/browser/metrics/user_metrics.h"
74 #include "chrome/browser/net/sdch_dictionary_fetcher.h" 73 #include "chrome/browser/net/sdch_dictionary_fetcher.h"
75 #include "chrome/browser/net/url_fixer_upper.h" 74 #include "chrome/browser/net/url_fixer_upper.h"
76 #include "chrome/browser/printing/print_job_manager.h" 75 #include "chrome/browser/printing/print_job_manager.h"
77 #include "chrome/browser/profile.h" 76 #include "chrome/browser/profile.h"
78 #include "chrome/browser/rlz/rlz.h" 77 #include "chrome/browser/rlz/rlz.h"
(...skipping 486 matching lines...) Expand 10 before | Expand all | Expand 10 after
565 if (metrics) 564 if (metrics)
566 metrics->Stop(); 565 metrics->Stop();
567 566
568 // browser_shutdown takes care of deleting browser_process, so we need to 567 // browser_shutdown takes care of deleting browser_process, so we need to
569 // release it. 568 // release it.
570 browser_process.release(); 569 browser_process.release();
571 browser_shutdown::Shutdown(); 570 browser_shutdown::Shutdown();
572 571
573 return result_code; 572 return result_code;
574 } 573 }
OLDNEW
« no previous file with comments | « chrome/browser/browser_init.cc ('k') | chrome/chrome.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698