OLD | NEW |
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 "app/l10n_util.h" | 5 #include "app/l10n_util.h" |
6 #include "base/file_util.h" | 6 #include "base/file_util.h" |
7 #include "base/string_util.h" | 7 #include "base/string_util.h" |
8 #include "base/utf_string_conversions.h" | 8 #include "base/utf_string_conversions.h" |
9 #include "chrome/browser/browser_list.h" | 9 #include "chrome/browser/browser_list.h" |
10 #include "chrome/browser/browser_window.h" | 10 #include "chrome/browser/browser_window.h" |
11 #include "chrome/browser/extensions/extension_install_ui.h" | 11 #include "chrome/browser/extensions/extension_install_ui.h" |
12 #include "chrome/browser/views/window.h" | 12 #include "chrome/browser/ui/views/window.h" |
13 #include "chrome/common/extensions/extension.h" | 13 #include "chrome/common/extensions/extension.h" |
14 #include "grit/generated_resources.h" | 14 #include "grit/generated_resources.h" |
15 #include "views/controls/button/checkbox.h" | 15 #include "views/controls/button/checkbox.h" |
16 #include "views/controls/image_view.h" | 16 #include "views/controls/image_view.h" |
17 #include "views/controls/label.h" | 17 #include "views/controls/label.h" |
18 #include "views/controls/link.h" | 18 #include "views/controls/link.h" |
19 #include "views/standard_layout.h" | 19 #include "views/standard_layout.h" |
20 #include "views/view.h" | 20 #include "views/view.h" |
21 #include "views/window/dialog_delegate.h" | 21 #include "views/window/dialog_delegate.h" |
22 #include "views/window/window.h" | 22 #include "views/window/window.h" |
(...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
155 BrowserWindow* window = browser->window(); | 155 BrowserWindow* window = browser->window(); |
156 if (!window) { | 156 if (!window) { |
157 delegate->InstallUIAbort(); | 157 delegate->InstallUIAbort(); |
158 return; | 158 return; |
159 } | 159 } |
160 | 160 |
161 browser::CreateViewsWindow(window->GetNativeHandle(), gfx::Rect(), | 161 browser::CreateViewsWindow(window->GetNativeHandle(), gfx::Rect(), |
162 new InstallDialogContent(delegate, extension, icon, | 162 new InstallDialogContent(delegate, extension, icon, |
163 type))->Show(); | 163 type))->Show(); |
164 } | 164 } |
OLD | NEW |