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

Side by Side Diff: chrome/browser/first_run/first_run_win.cc

Issue 3447008: base: Finish moving the SplitString functions from string_util.h to string_split.h (Closed) Base URL: git://git.chromium.org/chromium.git
Patch Set: chromeos fixes Created 10 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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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/first_run/first_run.h" 5 #include "chrome/browser/first_run/first_run.h"
6 6
7 #include <windows.h> 7 #include <windows.h>
8 #include <shellapi.h> 8 #include <shellapi.h>
9 #include <shlobj.h> 9 #include <shlobj.h>
10 10
11 #include <set> 11 #include <set>
12 #include <sstream> 12 #include <sstream>
13 13
14 #include "app/app_switches.h" 14 #include "app/app_switches.h"
15 #include "app/l10n_util.h" 15 #include "app/l10n_util.h"
16 #include "app/resource_bundle.h" 16 #include "app/resource_bundle.h"
17 #include "base/environment.h" 17 #include "base/environment.h"
18 #include "base/file_util.h" 18 #include "base/file_util.h"
19 #include "base/object_watcher.h" 19 #include "base/object_watcher.h"
20 #include "base/path_service.h" 20 #include "base/path_service.h"
21 #include "base/registry.h" 21 #include "base/registry.h"
22 #include "base/scoped_comptr_win.h" 22 #include "base/scoped_comptr_win.h"
23 #include "base/scoped_ptr.h" 23 #include "base/scoped_ptr.h"
24 #include "base/string_number_conversions.h" 24 #include "base/string_number_conversions.h"
25 #include "base/string_split.h"
25 #include "base/utf_string_conversions.h" 26 #include "base/utf_string_conversions.h"
26 #include "base/win_util.h" 27 #include "base/win_util.h"
27 #include "chrome/browser/extensions/extensions_service.h" 28 #include "chrome/browser/extensions/extensions_service.h"
28 #include "chrome/browser/extensions/extension_updater.h" 29 #include "chrome/browser/extensions/extension_updater.h"
29 #include "chrome/browser/importer/importer.h" 30 #include "chrome/browser/importer/importer.h"
30 #include "chrome/browser/metrics/user_metrics.h" 31 #include "chrome/browser/metrics/user_metrics.h"
31 #include "chrome/browser/process_singleton.h" 32 #include "chrome/browser/process_singleton.h"
32 #include "chrome/browser/profile.h" 33 #include "chrome/browser/profile.h"
33 #include "chrome/browser/views/first_run_search_engine_view.h" 34 #include "chrome/browser/views/first_run_search_engine_view.h"
34 #include "chrome/common/chrome_switches.h" 35 #include "chrome/common/chrome_switches.h"
(...skipping 828 matching lines...) Expand 10 before | Expand all | Expand 10 after
863 864
864 Upgrade::TryResult Upgrade::ShowTryChromeDialog(size_t version) { 865 Upgrade::TryResult Upgrade::ShowTryChromeDialog(size_t version) {
865 if (version > 10000) { 866 if (version > 10000) {
866 // This is a test value. We want to make sure we exercise 867 // This is a test value. We want to make sure we exercise
867 // returning this early. See EarlyReturnTest test harness. 868 // returning this early. See EarlyReturnTest test harness.
868 return Upgrade::TD_NOT_NOW; 869 return Upgrade::TD_NOT_NOW;
869 } 870 }
870 TryChromeDialog td(version); 871 TryChromeDialog td(version);
871 return td.ShowModal(); 872 return td.ShowModal();
872 } 873 }
OLDNEW
« no previous file with comments | « chrome/browser/extensions/extension_updater_unittest.cc ('k') | chrome/browser/history/snippet.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698