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

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

Issue 6263008: Move ResourceBundle, DataPack to ui/base (Closed) Base URL: svn://svn.chromium.org/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_main_mac.mm » ('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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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
11 #include "app/l10n_util.h" 11 #include "app/l10n_util.h"
12 #include "app/resource_bundle.h"
13 #include "base/at_exit.h" 12 #include "base/at_exit.h"
14 #include "base/command_line.h" 13 #include "base/command_line.h"
15 #include "base/debug/trace_event.h" 14 #include "base/debug/trace_event.h"
16 #include "base/file_path.h" 15 #include "base/file_path.h"
17 #include "base/file_util.h" 16 #include "base/file_util.h"
18 #include "base/mac/scoped_nsautorelease_pool.h" 17 #include "base/mac/scoped_nsautorelease_pool.h"
19 #include "base/metrics/field_trial.h" 18 #include "base/metrics/field_trial.h"
20 #include "base/metrics/histogram.h" 19 #include "base/metrics/histogram.h"
21 #include "base/path_service.h" 20 #include "base/path_service.h"
22 #include "base/process_util.h" 21 #include "base/process_util.h"
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
95 #include "net/base/network_change_notifier.h" 94 #include "net/base/network_change_notifier.h"
96 #include "net/http/http_network_layer.h" 95 #include "net/http/http_network_layer.h"
97 #include "net/http/http_stream_factory.h" 96 #include "net/http/http_stream_factory.h"
98 #include "net/socket/client_socket_pool_base.h" 97 #include "net/socket/client_socket_pool_base.h"
99 #include "net/socket/client_socket_pool_manager.h" 98 #include "net/socket/client_socket_pool_manager.h"
100 #include "net/socket/tcp_client_socket.h" 99 #include "net/socket/tcp_client_socket.h"
101 #include "net/spdy/spdy_session.h" 100 #include "net/spdy/spdy_session.h"
102 #include "net/spdy/spdy_session_pool.h" 101 #include "net/spdy/spdy_session_pool.h"
103 #include "net/url_request/url_request.h" 102 #include "net/url_request/url_request.h"
104 #include "net/url_request/url_request_throttler_manager.h" 103 #include "net/url_request/url_request_throttler_manager.h"
104 #include "ui/base/resource/resource_bundle.h"
105 #include "ui/base/system_monitor/system_monitor.h" 105 #include "ui/base/system_monitor/system_monitor.h"
106 106
107 #if defined(USE_LINUX_BREAKPAD) 107 #if defined(USE_LINUX_BREAKPAD)
108 #include "base/linux_util.h" 108 #include "base/linux_util.h"
109 #include "chrome/app/breakpad_linux.h" 109 #include "chrome/app/breakpad_linux.h"
110 #endif 110 #endif
111 111
112 #if defined(OS_POSIX) && !defined(OS_MACOSX) 112 #if defined(OS_POSIX) && !defined(OS_MACOSX)
113 #include <dbus/dbus-glib.h> 113 #include <dbus/dbus-glib.h>
114 #include "chrome/browser/browser_main_gtk.h" 114 #include "chrome/browser/browser_main_gtk.h"
(...skipping 1634 matching lines...) Expand 10 before | Expand all | Expand 10 after
1749 #if defined(OS_CHROMEOS) 1749 #if defined(OS_CHROMEOS)
1750 // To be precise, logout (browser shutdown) is not yet done, but the 1750 // To be precise, logout (browser shutdown) is not yet done, but the
1751 // remaining work is negligible, hence we say LogoutDone here. 1751 // remaining work is negligible, hence we say LogoutDone here.
1752 chromeos::BootTimesLoader::Get()->AddLogoutTimeMarker("LogoutDone", 1752 chromeos::BootTimesLoader::Get()->AddLogoutTimeMarker("LogoutDone",
1753 false); 1753 false);
1754 chromeos::BootTimesLoader::Get()->WriteLogoutTimes(); 1754 chromeos::BootTimesLoader::Get()->WriteLogoutTimes();
1755 #endif 1755 #endif
1756 TRACE_EVENT_END("BrowserMain", 0, 0); 1756 TRACE_EVENT_END("BrowserMain", 0, 0);
1757 return result_code; 1757 return result_code;
1758 } 1758 }
OLDNEW
« no previous file with comments | « chrome/browser/browser_about_handler.cc ('k') | chrome/browser/browser_main_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698