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

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

Issue 7084010: Move sandbox_policy to content. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 6 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) 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 151 matching lines...) Expand 10 before | Expand all | Expand 10 after
162 162
163 #include "app/win/scoped_com_initializer.h" 163 #include "app/win/scoped_com_initializer.h"
164 #include "base/win/windows_version.h" 164 #include "base/win/windows_version.h"
165 #include "chrome/browser/browser_trial.h" 165 #include "chrome/browser/browser_trial.h"
166 #include "chrome/browser/browser_util_win.h" 166 #include "chrome/browser/browser_util_win.h"
167 #include "chrome/browser/first_run/try_chrome_dialog_view.h" 167 #include "chrome/browser/first_run/try_chrome_dialog_view.h"
168 #include "chrome/browser/first_run/upgrade_util_win.h" 168 #include "chrome/browser/first_run/upgrade_util_win.h"
169 #include "chrome/browser/net/url_fixer_upper.h" 169 #include "chrome/browser/net/url_fixer_upper.h"
170 #include "chrome/browser/rlz/rlz.h" 170 #include "chrome/browser/rlz/rlz.h"
171 #include "chrome/browser/ui/views/user_data_dir_dialog.h" 171 #include "chrome/browser/ui/views/user_data_dir_dialog.h"
172 #include "chrome/common/sandbox_policy.h"
173 #include "chrome/installer/util/helper.h" 172 #include "chrome/installer/util/helper.h"
174 #include "chrome/installer/util/install_util.h" 173 #include "chrome/installer/util/install_util.h"
175 #include "chrome/installer/util/shell_util.h" 174 #include "chrome/installer/util/shell_util.h"
176 #include "content/browser/user_metrics.h" 175 #include "content/browser/user_metrics.h"
176 #include "content/common/sandbox_policy.h"
177 #include "net/base/net_util.h" 177 #include "net/base/net_util.h"
178 #include "net/base/sdch_manager.h" 178 #include "net/base/sdch_manager.h"
179 #include "printing/printed_document.h" 179 #include "printing/printed_document.h"
180 #include "sandbox/src/sandbox.h" 180 #include "sandbox/src/sandbox.h"
181 #include "ui/base/l10n/l10n_util_win.h" 181 #include "ui/base/l10n/l10n_util_win.h"
182 #include "ui/gfx/platform_font_win.h" 182 #include "ui/gfx/platform_font_win.h"
183 #endif // defined(OS_WIN) 183 #endif // defined(OS_WIN)
184 184
185 #if defined(OS_MACOSX) 185 #if defined(OS_MACOSX)
186 #include <Security/Security.h> 186 #include <Security/Security.h>
(...skipping 1794 matching lines...) Expand 10 before | Expand all | Expand 10 after
1981 #if defined(OS_CHROMEOS) 1981 #if defined(OS_CHROMEOS)
1982 // To be precise, logout (browser shutdown) is not yet done, but the 1982 // To be precise, logout (browser shutdown) is not yet done, but the
1983 // remaining work is negligible, hence we say LogoutDone here. 1983 // remaining work is negligible, hence we say LogoutDone here.
1984 chromeos::BootTimesLoader::Get()->AddLogoutTimeMarker("LogoutDone", 1984 chromeos::BootTimesLoader::Get()->AddLogoutTimeMarker("LogoutDone",
1985 false); 1985 false);
1986 chromeos::BootTimesLoader::Get()->WriteLogoutTimes(); 1986 chromeos::BootTimesLoader::Get()->WriteLogoutTimes();
1987 #endif 1987 #endif
1988 TRACE_EVENT_END_ETW("BrowserMain", 0, 0); 1988 TRACE_EVENT_END_ETW("BrowserMain", 0, 0);
1989 return result_code; 1989 return result_code;
1990 } 1990 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chrome_content_browser_client.h » ('j') | content/content_common.gypi » ('J')

Powered by Google App Engine
This is Rietveld 408576698