| 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 <gtk/gtk.h> | 5 #include <gtk/gtk.h> |
| 6 | 6 |
| 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/ui/gtk/browser_window_gtk.h" | 12 #include "chrome/browser/ui/gtk/browser_window_gtk.h" |
| 13 #include "chrome/browser/ui/gtk/gtk_util.h" | 13 #include "chrome/browser/ui/gtk/gtk_util.h" |
| 14 #include "chrome/common/extensions/extension.h" | 14 #include "chrome/common/extensions/extension.h" |
| 15 #include "gfx/gtk_util.h" | |
| 16 #include "grit/generated_resources.h" | 15 #include "grit/generated_resources.h" |
| 17 #include "skia/ext/image_operations.h" | 16 #include "skia/ext/image_operations.h" |
| 18 #include "ui/base/l10n/l10n_util.h" | 17 #include "ui/base/l10n/l10n_util.h" |
| 18 #include "ui/gfx/gtk_util.h" |
| 19 | 19 |
| 20 class Profile; | 20 class Profile; |
| 21 | 21 |
| 22 namespace { | 22 namespace { |
| 23 | 23 |
| 24 const int kRightColumnMinWidth = 290; | 24 const int kRightColumnMinWidth = 290; |
| 25 | 25 |
| 26 const int kImageSize = 69; | 26 const int kImageSize = 69; |
| 27 | 27 |
| 28 // Padding on all sides of each permission in the permissions list. | 28 // Padding on all sides of each permission in the permissions list. |
| (...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 182 BrowserWindowGtk* browser_window = static_cast<BrowserWindowGtk*>( | 182 BrowserWindowGtk* browser_window = static_cast<BrowserWindowGtk*>( |
| 183 browser->window()); | 183 browser->window()); |
| 184 if (!browser_window) { | 184 if (!browser_window) { |
| 185 delegate->InstallUIAbort(); | 185 delegate->InstallUIAbort(); |
| 186 return; | 186 return; |
| 187 } | 187 } |
| 188 | 188 |
| 189 ShowInstallPromptDialog2(browser_window->window(), icon, extension, | 189 ShowInstallPromptDialog2(browser_window->window(), icon, extension, |
| 190 delegate, permissions); | 190 delegate, permissions); |
| 191 } | 191 } |
| OLD | NEW |