| OLD | NEW |
| 1 // Copyright (c) 2011 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> |
| 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" | |
| 17 #include "base/environment.h" | 16 #include "base/environment.h" |
| 18 #include "base/file_util.h" | 17 #include "base/file_util.h" |
| 19 #include "base/path_service.h" | 18 #include "base/path_service.h" |
| 20 #include "base/scoped_comptr_win.h" | 19 #include "base/scoped_comptr_win.h" |
| 21 #include "base/scoped_ptr.h" | 20 #include "base/scoped_ptr.h" |
| 22 #include "base/string_number_conversions.h" | 21 #include "base/string_number_conversions.h" |
| 23 #include "base/string_split.h" | 22 #include "base/string_split.h" |
| 24 #include "base/utf_string_conversions.h" | 23 #include "base/utf_string_conversions.h" |
| 25 #include "base/win/object_watcher.h" | 24 #include "base/win/object_watcher.h" |
| 26 #include "base/win/registry.h" | 25 #include "base/win/registry.h" |
| (...skipping 24 matching lines...) Expand all Loading... |
| 51 #include "views/controls/button/image_button.h" | 50 #include "views/controls/button/image_button.h" |
| 52 #include "views/controls/button/radio_button.h" | 51 #include "views/controls/button/radio_button.h" |
| 53 #include "views/controls/image_view.h" | 52 #include "views/controls/image_view.h" |
| 54 #include "views/controls/link.h" | 53 #include "views/controls/link.h" |
| 55 #include "views/focus/accelerator_handler.h" | 54 #include "views/focus/accelerator_handler.h" |
| 56 #include "views/grid_layout.h" | 55 #include "views/grid_layout.h" |
| 57 #include "views/standard_layout.h" | 56 #include "views/standard_layout.h" |
| 58 #include "views/widget/root_view.h" | 57 #include "views/widget/root_view.h" |
| 59 #include "views/widget/widget_win.h" | 58 #include "views/widget/widget_win.h" |
| 60 #include "views/window/window.h" | 59 #include "views/window/window.h" |
| 60 #include "ui/base/resource/resource_bundle.h" |
| 61 #include "ui/base/ui_base_switches.h" |
| 61 | 62 |
| 62 namespace { | 63 namespace { |
| 63 | 64 |
| 64 bool GetNewerChromeFile(FilePath* path) { | 65 bool GetNewerChromeFile(FilePath* path) { |
| 65 if (!PathService::Get(base::DIR_EXE, path)) | 66 if (!PathService::Get(base::DIR_EXE, path)) |
| 66 return false; | 67 return false; |
| 67 *path = path->Append(installer::kChromeNewExe); | 68 *path = path->Append(installer::kChromeNewExe); |
| 68 return true; | 69 return true; |
| 69 } | 70 } |
| 70 | 71 |
| (...skipping 785 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 856 | 857 |
| 857 Upgrade::TryResult Upgrade::ShowTryChromeDialog(size_t version) { | 858 Upgrade::TryResult Upgrade::ShowTryChromeDialog(size_t version) { |
| 858 if (version > 10000) { | 859 if (version > 10000) { |
| 859 // This is a test value. We want to make sure we exercise | 860 // This is a test value. We want to make sure we exercise |
| 860 // returning this early. See EarlyReturnTest test harness. | 861 // returning this early. See EarlyReturnTest test harness. |
| 861 return Upgrade::TD_NOT_NOW; | 862 return Upgrade::TD_NOT_NOW; |
| 862 } | 863 } |
| 863 TryChromeDialog td(version); | 864 TryChromeDialog td(version); |
| 864 return td.ShowModal(); | 865 return td.ShowModal(); |
| 865 } | 866 } |
| OLD | NEW |