| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/plugins/plugin_infobar_delegates.h" | 5 #include "chrome/browser/plugins/plugin_infobar_delegates.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/path_service.h" | 10 #include "base/path_service.h" |
| (...skipping 20 matching lines...) Expand all Loading... |
| 31 #include "grit/theme_resources.h" | 31 #include "grit/theme_resources.h" |
| 32 #include "ui/base/l10n/l10n_util.h" | 32 #include "ui/base/l10n/l10n_util.h" |
| 33 | 33 |
| 34 #if defined(ENABLE_PLUGIN_INSTALLATION) | 34 #if defined(ENABLE_PLUGIN_INSTALLATION) |
| 35 #include "chrome/browser/plugins/plugin_installer.h" | 35 #include "chrome/browser/plugins/plugin_installer.h" |
| 36 #endif | 36 #endif |
| 37 | 37 |
| 38 #if defined(OS_WIN) | 38 #if defined(OS_WIN) |
| 39 #include <shellapi.h> | 39 #include <shellapi.h> |
| 40 #include "ui/base/win/shell.h" | 40 #include "ui/base/win/shell.h" |
| 41 | |
| 42 #if defined(USE_AURA) | |
| 43 #include "ui/aura/remote_window_tree_host_win.h" | |
| 44 #endif | |
| 45 #endif | 41 #endif |
| 46 | 42 |
| 47 using base::UserMetricsAction; | 43 using base::UserMetricsAction; |
| 48 | 44 |
| 49 #if defined(ENABLE_PLUGIN_INSTALLATION) | 45 #if defined(ENABLE_PLUGIN_INSTALLATION) |
| 50 | 46 |
| 51 // OutdatedPluginInfoBarDelegate ---------------------------------------------- | 47 // OutdatedPluginInfoBarDelegate ---------------------------------------------- |
| 52 | 48 |
| 53 void OutdatedPluginInfoBarDelegate::Create( | 49 void OutdatedPluginInfoBarDelegate::Create( |
| 54 InfoBarService* infobar_service, | 50 InfoBarService* infobar_service, |
| (...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 208 const base::string16& message) { | 204 const base::string16& message) { |
| 209 DCHECK(infobar->owner()); | 205 DCHECK(infobar->owner()); |
| 210 infobar->owner()->ReplaceInfoBar( | 206 infobar->owner()->ReplaceInfoBar( |
| 211 infobar, | 207 infobar, |
| 212 infobar->owner()->CreateConfirmInfoBar( | 208 infobar->owner()->CreateConfirmInfoBar( |
| 213 scoped_ptr<ConfirmInfoBarDelegate>(new OutdatedPluginInfoBarDelegate( | 209 scoped_ptr<ConfirmInfoBarDelegate>(new OutdatedPluginInfoBarDelegate( |
| 214 installer, std::move(plugin_metadata), message)))); | 210 installer, std::move(plugin_metadata), message)))); |
| 215 } | 211 } |
| 216 | 212 |
| 217 #endif // defined(ENABLE_PLUGIN_INSTALLATION) | 213 #endif // defined(ENABLE_PLUGIN_INSTALLATION) |
| OLD | NEW |