OLD | NEW |
1 // Copyright (c) 2006-2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2009 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.h" | 5 #include "chrome/browser/first_run.h" |
6 | 6 |
7 #include <atlbase.h> | 7 #include <atlbase.h> |
8 #include <atlcom.h> | 8 #include <atlcom.h> |
9 #include <windows.h> | 9 #include <windows.h> |
10 #include <shellapi.h> | 10 #include <shellapi.h> |
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
49 #include "grit/app_resources.h" | 49 #include "grit/app_resources.h" |
50 #include "grit/locale_settings.h" | 50 #include "grit/locale_settings.h" |
51 #include "grit/theme_resources.h" | 51 #include "grit/theme_resources.h" |
52 #include "views/background.h" | 52 #include "views/background.h" |
53 #include "views/controls/button/image_button.h" | 53 #include "views/controls/button/image_button.h" |
54 #include "views/controls/button/native_button.h" | 54 #include "views/controls/button/native_button.h" |
55 #include "views/controls/button/radio_button.h" | 55 #include "views/controls/button/radio_button.h" |
56 #include "views/controls/image_view.h" | 56 #include "views/controls/image_view.h" |
57 #include "views/controls/label.h" | 57 #include "views/controls/label.h" |
58 #include "views/controls/link.h" | 58 #include "views/controls/link.h" |
| 59 #include "views/focus/accelerator_handler.h" |
59 #include "views/grid_layout.h" | 60 #include "views/grid_layout.h" |
60 #include "views/standard_layout.h" | 61 #include "views/standard_layout.h" |
61 #include "views/widget/accelerator_handler.h" | |
62 #include "views/widget/root_view.h" | 62 #include "views/widget/root_view.h" |
63 #include "views/widget/widget_win.h" | 63 #include "views/widget/widget_win.h" |
64 #include "views/window/window.h" | 64 #include "views/window/window.h" |
65 | 65 |
66 namespace { | 66 namespace { |
67 | 67 |
68 bool GetNewerChromeFile(std::wstring* path) { | 68 bool GetNewerChromeFile(std::wstring* path) { |
69 if (!PathService::Get(base::DIR_EXE, path)) | 69 if (!PathService::Get(base::DIR_EXE, path)) |
70 return false; | 70 return false; |
71 file_util::AppendToPath(path, installer_util::kChromeNewExe); | 71 file_util::AppendToPath(path, installer_util::kChromeNewExe); |
(...skipping 779 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
851 | 851 |
852 DISALLOW_COPY_AND_ASSIGN(TryChromeDialog); | 852 DISALLOW_COPY_AND_ASSIGN(TryChromeDialog); |
853 }; | 853 }; |
854 | 854 |
855 } // namespace | 855 } // namespace |
856 | 856 |
857 Upgrade::TryResult Upgrade::ShowTryChromeDialog() { | 857 Upgrade::TryResult Upgrade::ShowTryChromeDialog() { |
858 TryChromeDialog td; | 858 TryChromeDialog td; |
859 return td.ShowModal(); | 859 return td.ShowModal(); |
860 } | 860 } |
OLD | NEW |