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

Side by Side Diff: chrome/browser/ui/startup/startup_browser_creator_impl.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/ui/startup/startup_browser_creator_impl.h" 5 #include "chrome/browser/ui/startup/startup_browser_creator_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <vector> 8 #include <vector>
9 9
10 #include "apps/app_restore_service.h" 10 #include "apps/app_restore_service.h"
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
71 #include "chrome/browser/ui/startup/startup_browser_creator.h" 71 #include "chrome/browser/ui/startup/startup_browser_creator.h"
72 #include "chrome/browser/ui/tabs/pinned_tab_codec.h" 72 #include "chrome/browser/ui/tabs/pinned_tab_codec.h"
73 #include "chrome/browser/ui/tabs/tab_strip_model.h" 73 #include "chrome/browser/ui/tabs/tab_strip_model.h"
74 #include "chrome/browser/ui/webui/ntp/core_app_launcher_handler.h" 74 #include "chrome/browser/ui/webui/ntp/core_app_launcher_handler.h"
75 #include "chrome/common/chrome_constants.h" 75 #include "chrome/common/chrome_constants.h"
76 #include "chrome/common/chrome_paths.h" 76 #include "chrome/common/chrome_paths.h"
77 #include "chrome/common/chrome_result_codes.h" 77 #include "chrome/common/chrome_result_codes.h"
78 #include "chrome/common/chrome_switches.h" 78 #include "chrome/common/chrome_switches.h"
79 #include "chrome/common/chrome_version_info.h" 79 #include "chrome/common/chrome_version_info.h"
80 #include "chrome/common/extensions/extension_constants.h" 80 #include "chrome/common/extensions/extension_constants.h"
81 #include "chrome/common/net/url_fixer_upper.h"
82 #include "chrome/common/pref_names.h" 81 #include "chrome/common/pref_names.h"
83 #include "chrome/common/url_constants.h" 82 #include "chrome/common/url_constants.h"
84 #include "chrome/installer/util/browser_distribution.h" 83 #include "chrome/installer/util/browser_distribution.h"
85 #include "content/public/browser/child_process_security_policy.h" 84 #include "content/public/browser/child_process_security_policy.h"
86 #include "content/public/browser/dom_storage_context.h" 85 #include "content/public/browser/dom_storage_context.h"
87 #include "content/public/browser/notification_observer.h" 86 #include "content/public/browser/notification_observer.h"
88 #include "content/public/browser/notification_registrar.h" 87 #include "content/public/browser/notification_registrar.h"
89 #include "content/public/browser/storage_partition.h" 88 #include "content/public/browser/storage_partition.h"
90 #include "content/public/browser/web_contents.h" 89 #include "content/public/browser/web_contents.h"
91 #include "extensions/browser/extension_prefs.h" 90 #include "extensions/browser/extension_prefs.h"
(...skipping 835 matching lines...) Expand 10 before | Expand all | Expand 10 after
927 // behavior is desired because completing or skipping the sync promo 926 // behavior is desired because completing or skipping the sync promo
928 // causes a redirect to the NTP. 927 // causes a redirect to the NTP.
929 if (!startup_urls->empty() && 928 if (!startup_urls->empty() &&
930 startup_urls->at(0) == GURL(chrome::kChromeUINewTabURL)) 929 startup_urls->at(0) == GURL(chrome::kChromeUINewTabURL))
931 startup_urls->at(0) = sync_promo_url; 930 startup_urls->at(0) = sync_promo_url;
932 else 931 else
933 startup_urls->insert(startup_urls->begin(), sync_promo_url); 932 startup_urls->insert(startup_urls->begin(), sync_promo_url);
934 } 933 }
935 } 934 }
936 } 935 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/startup/startup_browser_creator.cc ('k') | chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698