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

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

Issue 320253004: Componentize URLFixerUpper. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Win64 fix Created 6 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/chrome_browser_main.h" 5 #include "chrome/browser/chrome_browser_main.h"
6 6
7 #include <set> 7 #include <set>
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 150 matching lines...) Expand 10 before | Expand all | Expand 10 after
161 // progress and should not be taken as an indication of a real refactoring. 161 // progress and should not be taken as an indication of a real refactoring.
162 162
163 #if defined(OS_WIN) 163 #if defined(OS_WIN)
164 #include "base/environment.h" // For PreRead experiment. 164 #include "base/environment.h" // For PreRead experiment.
165 #include "base/win/windows_version.h" 165 #include "base/win/windows_version.h"
166 #include "chrome/browser/browser_util_win.h" 166 #include "chrome/browser/browser_util_win.h"
167 #include "chrome/browser/chrome_browser_main_win.h" 167 #include "chrome/browser/chrome_browser_main_win.h"
168 #include "chrome/browser/first_run/try_chrome_dialog_view.h" 168 #include "chrome/browser/first_run/try_chrome_dialog_view.h"
169 #include "chrome/browser/first_run/upgrade_util_win.h" 169 #include "chrome/browser/first_run/upgrade_util_win.h"
170 #include "chrome/browser/ui/network_profile_bubble.h" 170 #include "chrome/browser/ui/network_profile_bubble.h"
171 #include "chrome/common/net/url_fixer_upper.h"
172 #include "chrome/installer/util/helper.h" 171 #include "chrome/installer/util/helper.h"
173 #include "chrome/installer/util/install_util.h" 172 #include "chrome/installer/util/install_util.h"
174 #include "chrome/installer/util/shell_util.h" 173 #include "chrome/installer/util/shell_util.h"
175 #include "net/base/net_util.h" 174 #include "net/base/net_util.h"
176 #include "ui/base/l10n/l10n_util_win.h" 175 #include "ui/base/l10n/l10n_util_win.h"
177 #include "ui/gfx/win/dpi.h" 176 #include "ui/gfx/win/dpi.h"
178 #endif // defined(OS_WIN) 177 #endif // defined(OS_WIN)
179 178
180 #if defined(OS_MACOSX) 179 #if defined(OS_MACOSX)
181 #include <Security/Security.h> 180 #include <Security/Security.h>
(...skipping 1472 matching lines...) Expand 10 before | Expand all | Expand 10 after
1654 chromeos::CrosSettings::Shutdown(); 1653 chromeos::CrosSettings::Shutdown();
1655 #endif 1654 #endif
1656 #endif 1655 #endif
1657 } 1656 }
1658 1657
1659 // Public members: 1658 // Public members:
1660 1659
1661 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { 1660 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) {
1662 chrome_extra_parts_.push_back(parts); 1661 chrome_extra_parts_.push_back(parts);
1663 } 1662 }
OLDNEW
« no previous file with comments | « chrome/browser/browser_about_handler.cc ('k') | chrome/browser/collected_cookies_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698