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

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

Issue 6028009: Move base/thread.h to base/threading, fix up callers to use the new location.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 9 years, 11 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_about_handler.cc ('k') | chrome/browser/browser_process_impl.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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 10 matching lines...) Expand all
21 #include "base/metrics/field_trial.h" 21 #include "base/metrics/field_trial.h"
22 #include "base/metrics/histogram.h" 22 #include "base/metrics/histogram.h"
23 #include "base/path_service.h" 23 #include "base/path_service.h"
24 #include "base/platform_thread.h" 24 #include "base/platform_thread.h"
25 #include "base/process_util.h" 25 #include "base/process_util.h"
26 #include "base/string_number_conversions.h" 26 #include "base/string_number_conversions.h"
27 #include "base/string_piece.h" 27 #include "base/string_piece.h"
28 #include "base/string_split.h" 28 #include "base/string_split.h"
29 #include "base/string_util.h" 29 #include "base/string_util.h"
30 #include "base/sys_string_conversions.h" 30 #include "base/sys_string_conversions.h"
31 #include "base/thread_restrictions.h" 31 #include "base/threading/thread_restrictions.h"
32 #include "base/time.h" 32 #include "base/time.h"
33 #include "base/utf_string_conversions.h" 33 #include "base/utf_string_conversions.h"
34 #include "base/values.h" 34 #include "base/values.h"
35 #include "build/build_config.h" 35 #include "build/build_config.h"
36 #include "chrome/browser/about_flags.h" 36 #include "chrome/browser/about_flags.h"
37 #include "chrome/browser/browser_main_win.h" 37 #include "chrome/browser/browser_main_win.h"
38 #include "chrome/browser/prefs/browser_prefs.h" 38 #include "chrome/browser/prefs/browser_prefs.h"
39 #include "chrome/browser/browser_process.h" 39 #include "chrome/browser/browser_process.h"
40 #include "chrome/browser/browser_process_impl.h" 40 #include "chrome/browser/browser_process_impl.h"
41 #include "chrome/browser/browser_shutdown.h" 41 #include "chrome/browser/browser_shutdown.h"
(...skipping 1693 matching lines...) Expand 10 before | Expand all | Expand 10 after
1735 #if defined(OS_CHROMEOS) 1735 #if defined(OS_CHROMEOS)
1736 // To be precise, logout (browser shutdown) is not yet done, but the 1736 // To be precise, logout (browser shutdown) is not yet done, but the
1737 // remaining work is negligible, hence we say LogoutDone here. 1737 // remaining work is negligible, hence we say LogoutDone here.
1738 chromeos::BootTimesLoader::Get()->AddLogoutTimeMarker("LogoutDone", 1738 chromeos::BootTimesLoader::Get()->AddLogoutTimeMarker("LogoutDone",
1739 false); 1739 false);
1740 chromeos::BootTimesLoader::Get()->WriteLogoutTimes(); 1740 chromeos::BootTimesLoader::Get()->WriteLogoutTimes();
1741 #endif 1741 #endif
1742 TRACE_EVENT_END("BrowserMain", 0, 0); 1742 TRACE_EVENT_END("BrowserMain", 0, 0);
1743 return result_code; 1743 return result_code;
1744 } 1744 }
OLDNEW
« no previous file with comments | « chrome/browser/browser_about_handler.cc ('k') | chrome/browser/browser_process_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698