Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(68)

Side by Side Diff: chrome/browser/plugins/plugin_infobar_delegates.cc

Issue 1602403002: Revert of Remove remote tree host and some related input and metro_driver code (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@metro-mode-3
Patch Set: Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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
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
41 #endif 45 #endif
42 46
43 using base::UserMetricsAction; 47 using base::UserMetricsAction;
44 48
45 #if defined(ENABLE_PLUGIN_INSTALLATION) 49 #if defined(ENABLE_PLUGIN_INSTALLATION)
46 50
47 // OutdatedPluginInfoBarDelegate ---------------------------------------------- 51 // OutdatedPluginInfoBarDelegate ----------------------------------------------
48 52
49 void OutdatedPluginInfoBarDelegate::Create( 53 void OutdatedPluginInfoBarDelegate::Create(
50 InfoBarService* infobar_service, 54 InfoBarService* infobar_service,
(...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after
204 const base::string16& message) { 208 const base::string16& message) {
205 DCHECK(infobar->owner()); 209 DCHECK(infobar->owner());
206 infobar->owner()->ReplaceInfoBar( 210 infobar->owner()->ReplaceInfoBar(
207 infobar, 211 infobar,
208 infobar->owner()->CreateConfirmInfoBar( 212 infobar->owner()->CreateConfirmInfoBar(
209 scoped_ptr<ConfirmInfoBarDelegate>(new OutdatedPluginInfoBarDelegate( 213 scoped_ptr<ConfirmInfoBarDelegate>(new OutdatedPluginInfoBarDelegate(
210 installer, std::move(plugin_metadata), message)))); 214 installer, std::move(plugin_metadata), message))));
211 } 215 }
212 216
213 #endif // defined(ENABLE_PLUGIN_INSTALLATION) 217 #endif // defined(ENABLE_PLUGIN_INSTALLATION)
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698