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

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

Issue 6672070: Move the remaining files in chrome\common to content\common. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 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 | Annotate | Revision Log
« no previous file with comments | « chrome/browser/browser_browsertest.cc ('k') | chrome/browser/browser_main_gtk.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) 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
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 #include "chrome/common/chrome_paths.h" 78 #include "chrome/common/chrome_paths.h"
79 #include "chrome/common/chrome_switches.h" 79 #include "chrome/common/chrome_switches.h"
80 #include "chrome/common/env_vars.h" 80 #include "chrome/common/env_vars.h"
81 #include "chrome/common/gfx_resource_provider.h" 81 #include "chrome/common/gfx_resource_provider.h"
82 #include "chrome/common/json_pref_store.h" 82 #include "chrome/common/json_pref_store.h"
83 #include "chrome/common/jstemplate_builder.h" 83 #include "chrome/common/jstemplate_builder.h"
84 #include "chrome/common/logging_chrome.h" 84 #include "chrome/common/logging_chrome.h"
85 #include "chrome/common/net/net_resource_provider.h" 85 #include "chrome/common/net/net_resource_provider.h"
86 #include "chrome/common/pref_names.h" 86 #include "chrome/common/pref_names.h"
87 #include "chrome/common/profiling.h" 87 #include "chrome/common/profiling.h"
88 #include "chrome/common/result_codes.h"
89 #include "chrome/installer/util/google_update_settings.h" 88 #include "chrome/installer/util/google_update_settings.h"
90 #include "content/browser/browser_thread.h" 89 #include "content/browser/browser_thread.h"
91 #include "content/browser/plugin_service.h" 90 #include "content/browser/plugin_service.h"
92 #include "content/browser/renderer_host/resource_dispatcher_host.h" 91 #include "content/browser/renderer_host/resource_dispatcher_host.h"
93 #include "content/common/child_process.h" 92 #include "content/common/child_process.h"
94 #include "content/common/content_client.h" 93 #include "content/common/content_client.h"
95 #include "content/common/hi_res_timer_manager.h" 94 #include "content/common/hi_res_timer_manager.h"
96 #include "content/common/main_function_params.h" 95 #include "content/common/main_function_params.h"
96 #include "content/common/result_codes.h"
97 #include "grit/app_locale_settings.h" 97 #include "grit/app_locale_settings.h"
98 #include "grit/chromium_strings.h" 98 #include "grit/chromium_strings.h"
99 #include "grit/generated_resources.h" 99 #include "grit/generated_resources.h"
100 #include "net/base/cookie_monster.h" 100 #include "net/base/cookie_monster.h"
101 #include "net/base/net_module.h" 101 #include "net/base/net_module.h"
102 #include "net/base/network_change_notifier.h" 102 #include "net/base/network_change_notifier.h"
103 #include "net/http/http_network_layer.h" 103 #include "net/http/http_network_layer.h"
104 #include "net/http/http_stream_factory.h" 104 #include "net/http/http_stream_factory.h"
105 #include "net/socket/client_socket_pool_base.h" 105 #include "net/socket/client_socket_pool_base.h"
106 #include "net/socket/client_socket_pool_manager.h" 106 #include "net/socket/client_socket_pool_manager.h"
(...skipping 1773 matching lines...) Expand 10 before | Expand all | Expand 10 after
1880 #if defined(OS_CHROMEOS) 1880 #if defined(OS_CHROMEOS)
1881 // To be precise, logout (browser shutdown) is not yet done, but the 1881 // To be precise, logout (browser shutdown) is not yet done, but the
1882 // remaining work is negligible, hence we say LogoutDone here. 1882 // remaining work is negligible, hence we say LogoutDone here.
1883 chromeos::BootTimesLoader::Get()->AddLogoutTimeMarker("LogoutDone", 1883 chromeos::BootTimesLoader::Get()->AddLogoutTimeMarker("LogoutDone",
1884 false); 1884 false);
1885 chromeos::BootTimesLoader::Get()->WriteLogoutTimes(); 1885 chromeos::BootTimesLoader::Get()->WriteLogoutTimes();
1886 #endif 1886 #endif
1887 TRACE_EVENT_END("BrowserMain", 0, 0); 1887 TRACE_EVENT_END("BrowserMain", 0, 0);
1888 return result_code; 1888 return result_code;
1889 } 1889 }
OLDNEW
« no previous file with comments | « chrome/browser/browser_browsertest.cc ('k') | chrome/browser/browser_main_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698