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

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

Issue 6204002: Carnitas: Remove chrome/browser/views, update references. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Yay, more syncing Created 9 years, 11 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
« no previous file with comments | « chrome/browser/external_tab_container_win.cc ('k') | chrome/browser/gtk/infobar_gtk.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2010 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/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>
(...skipping 13 matching lines...) Expand all
25 #include "base/win/object_watcher.h" 25 #include "base/win/object_watcher.h"
26 #include "base/win/registry.h" 26 #include "base/win/registry.h"
27 #include "base/win/windows_version.h" 27 #include "base/win/windows_version.h"
28 #include "chrome/browser/extensions/extension_service.h" 28 #include "chrome/browser/extensions/extension_service.h"
29 #include "chrome/browser/extensions/extension_updater.h" 29 #include "chrome/browser/extensions/extension_updater.h"
30 #include "chrome/browser/importer/importer.h" 30 #include "chrome/browser/importer/importer.h"
31 #include "chrome/browser/metrics/user_metrics.h" 31 #include "chrome/browser/metrics/user_metrics.h"
32 #include "chrome/browser/process_singleton.h" 32 #include "chrome/browser/process_singleton.h"
33 #include "chrome/browser/profiles/profile.h" 33 #include "chrome/browser/profiles/profile.h"
34 #include "chrome/browser/search_engines/template_url_model.h" 34 #include "chrome/browser/search_engines/template_url_model.h"
35 #include "chrome/browser/views/first_run_search_engine_view.h" 35 #include "chrome/browser/ui/views/first_run_search_engine_view.h"
36 #include "chrome/common/chrome_constants.h" 36 #include "chrome/common/chrome_constants.h"
37 #include "chrome/common/chrome_switches.h" 37 #include "chrome/common/chrome_switches.h"
38 #include "chrome/common/notification_service.h" 38 #include "chrome/common/notification_service.h"
39 #include "chrome/common/pref_names.h" 39 #include "chrome/common/pref_names.h"
40 #include "chrome/common/worker_thread_ticker.h" 40 #include "chrome/common/worker_thread_ticker.h"
41 #include "chrome/installer/util/browser_distribution.h" 41 #include "chrome/installer/util/browser_distribution.h"
42 #include "chrome/installer/util/google_update_constants.h" 42 #include "chrome/installer/util/google_update_constants.h"
43 #include "chrome/installer/util/google_update_settings.h" 43 #include "chrome/installer/util/google_update_settings.h"
44 #include "chrome/installer/util/install_util.h" 44 #include "chrome/installer/util/install_util.h"
45 #include "chrome/installer/util/shell_util.h" 45 #include "chrome/installer/util/shell_util.h"
(...skipping 809 matching lines...) Expand 10 before | Expand all | Expand 10 after
855 855
856 Upgrade::TryResult Upgrade::ShowTryChromeDialog(size_t version) { 856 Upgrade::TryResult Upgrade::ShowTryChromeDialog(size_t version) {
857 if (version > 10000) { 857 if (version > 10000) {
858 // This is a test value. We want to make sure we exercise 858 // This is a test value. We want to make sure we exercise
859 // returning this early. See EarlyReturnTest test harness. 859 // returning this early. See EarlyReturnTest test harness.
860 return Upgrade::TD_NOT_NOW; 860 return Upgrade::TD_NOT_NOW;
861 } 861 }
862 TryChromeDialog td(version); 862 TryChromeDialog td(version);
863 return td.ShowModal(); 863 return td.ShowModal();
864 } 864 }
OLDNEW
« no previous file with comments | « chrome/browser/external_tab_container_win.cc ('k') | chrome/browser/gtk/infobar_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698