| OLD | NEW |
| 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 "app/l10n_util.h" | 5 #include "app/l10n_util.h" |
| 6 #include "base/string_util.h" | 6 #include "base/string_util.h" |
| 7 #include "base/utf_string_conversions.h" | 7 #include "base/utf_string_conversions.h" |
| 8 #include "chrome/browser/browser_list.h" | 8 #include "chrome/browser/browser_list.h" |
| 9 #include "chrome/browser/browser_window.h" | 9 #include "chrome/browser/browser_window.h" |
| 10 #include "chrome/browser/extensions/extension_install_ui.h" | 10 #include "chrome/browser/extensions/extension_install_ui.h" |
| 11 #include "chrome/common/extensions/extension.h" | 11 #include "chrome/common/extensions/extension.h" |
| 12 #include "chrome/browser/views/window.h" |
| 12 #include "grit/generated_resources.h" | 13 #include "grit/generated_resources.h" |
| 13 #include "views/controls/image_view.h" | 14 #include "views/controls/image_view.h" |
| 14 #include "views/controls/label.h" | 15 #include "views/controls/label.h" |
| 15 #include "views/standard_layout.h" | 16 #include "views/standard_layout.h" |
| 16 #include "views/view.h" | 17 #include "views/view.h" |
| 17 #include "views/window/dialog_delegate.h" | 18 #include "views/window/dialog_delegate.h" |
| 18 #include "views/window/window.h" | 19 #include "views/window/window.h" |
| 19 | 20 |
| 20 class Profile; | 21 class Profile; |
| 21 | 22 |
| (...skipping 283 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 305 delegate->InstallUIAbort(); | 306 delegate->InstallUIAbort(); |
| 306 return; | 307 return; |
| 307 } | 308 } |
| 308 | 309 |
| 309 BrowserWindow* window = browser->window(); | 310 BrowserWindow* window = browser->window(); |
| 310 if (!window) { | 311 if (!window) { |
| 311 delegate->InstallUIAbort(); | 312 delegate->InstallUIAbort(); |
| 312 return; | 313 return; |
| 313 } | 314 } |
| 314 | 315 |
| 315 views::Window::CreateChromeWindow(window->GetNativeHandle(), gfx::Rect(), | 316 browser::CreateViewsWindow(window->GetNativeHandle(), gfx::Rect(), |
| 316 new InstallDialogContent2(delegate, extension, icon, permissions)) | 317 new InstallDialogContent2(delegate, extension, icon, permissions)) |
| 317 ->Show(); | 318 ->Show(); |
| 318 } | 319 } |
| OLD | NEW |