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

Side by Side Diff: chrome/browser/ui/startup/startup_browser_creator_impl.cc

Issue 507913002: Finish converting chrome_strings target to use qualified paths. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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
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 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 #include "chrome/browser/ui/tabs/tab_strip_model.h" 72 #include "chrome/browser/ui/tabs/tab_strip_model.h"
73 #include "chrome/browser/ui/webui/ntp/core_app_launcher_handler.h" 73 #include "chrome/browser/ui/webui/ntp/core_app_launcher_handler.h"
74 #include "chrome/common/chrome_constants.h" 74 #include "chrome/common/chrome_constants.h"
75 #include "chrome/common/chrome_paths.h" 75 #include "chrome/common/chrome_paths.h"
76 #include "chrome/common/chrome_result_codes.h" 76 #include "chrome/common/chrome_result_codes.h"
77 #include "chrome/common/chrome_switches.h" 77 #include "chrome/common/chrome_switches.h"
78 #include "chrome/common/chrome_version_info.h" 78 #include "chrome/common/chrome_version_info.h"
79 #include "chrome/common/extensions/extension_constants.h" 79 #include "chrome/common/extensions/extension_constants.h"
80 #include "chrome/common/pref_names.h" 80 #include "chrome/common/pref_names.h"
81 #include "chrome/common/url_constants.h" 81 #include "chrome/common/url_constants.h"
82 #include "chrome/grit/locale_settings.h"
82 #include "chrome/installer/util/browser_distribution.h" 83 #include "chrome/installer/util/browser_distribution.h"
83 #include "components/google/core/browser/google_util.h" 84 #include "components/google/core/browser/google_util.h"
84 #include "content/public/browser/child_process_security_policy.h" 85 #include "content/public/browser/child_process_security_policy.h"
85 #include "content/public/browser/dom_storage_context.h" 86 #include "content/public/browser/dom_storage_context.h"
86 #include "content/public/browser/notification_observer.h" 87 #include "content/public/browser/notification_observer.h"
87 #include "content/public/browser/notification_registrar.h" 88 #include "content/public/browser/notification_registrar.h"
88 #include "content/public/browser/storage_partition.h" 89 #include "content/public/browser/storage_partition.h"
89 #include "content/public/browser/web_contents.h" 90 #include "content/public/browser/web_contents.h"
90 #include "extensions/browser/extension_prefs.h" 91 #include "extensions/browser/extension_prefs.h"
91 #include "extensions/browser/extension_registry.h" 92 #include "extensions/browser/extension_registry.h"
92 #include "extensions/common/constants.h" 93 #include "extensions/common/constants.h"
93 #include "extensions/common/extension.h" 94 #include "extensions/common/extension.h"
94 #include "extensions/common/extension_set.h" 95 #include "extensions/common/extension_set.h"
95 #include "grit/locale_settings.h"
96 #include "ui/base/l10n/l10n_util.h" 96 #include "ui/base/l10n/l10n_util.h"
97 97
98 #if defined(OS_MACOSX) 98 #if defined(OS_MACOSX)
99 #include "base/mac/mac_util.h" 99 #include "base/mac/mac_util.h"
100 #include "chrome/browser/ui/cocoa/keystone_infobar_delegate.h" 100 #include "chrome/browser/ui/cocoa/keystone_infobar_delegate.h"
101 #endif 101 #endif
102 102
103 #if defined(OS_WIN) 103 #if defined(OS_WIN)
104 #include "base/win/windows_version.h" 104 #include "base/win/windows_version.h"
105 #include "chrome/browser/apps/app_launch_for_metro_restart_win.h" 105 #include "chrome/browser/apps/app_launch_for_metro_restart_win.h"
(...skipping 809 matching lines...) Expand 10 before | Expand all | Expand 10 after
915 // behavior is desired because completing or skipping the sync promo 915 // behavior is desired because completing or skipping the sync promo
916 // causes a redirect to the NTP. 916 // causes a redirect to the NTP.
917 if (!startup_urls->empty() && 917 if (!startup_urls->empty() &&
918 startup_urls->at(0) == GURL(chrome::kChromeUINewTabURL)) 918 startup_urls->at(0) == GURL(chrome::kChromeUINewTabURL))
919 startup_urls->at(0) = sync_promo_url; 919 startup_urls->at(0) = sync_promo_url;
920 else 920 else
921 startup_urls->insert(startup_urls->begin(), sync_promo_url); 921 startup_urls->insert(startup_urls->begin(), sync_promo_url);
922 } 922 }
923 } 923 }
924 } 924 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/prefs/prefs_tab_helper.cc ('k') | chrome/browser/ui/views/collected_cookies_views.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698