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

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

Issue 1586843002: 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 "base/bind.h" 7 #include "base/bind.h"
8 #include "base/path_service.h" 8 #include "base/path_service.h"
9 #include "base/strings/utf_string_conversions.h" 9 #include "base/strings/utf_string_conversions.h"
10 #include "build/build_config.h" 10 #include "build/build_config.h"
(...skipping 18 matching lines...) Expand all
29 #include "grit/theme_resources.h" 29 #include "grit/theme_resources.h"
30 #include "ui/base/l10n/l10n_util.h" 30 #include "ui/base/l10n/l10n_util.h"
31 31
32 #if defined(ENABLE_PLUGIN_INSTALLATION) 32 #if defined(ENABLE_PLUGIN_INSTALLATION)
33 #include "chrome/browser/plugins/plugin_installer.h" 33 #include "chrome/browser/plugins/plugin_installer.h"
34 #endif 34 #endif
35 35
36 #if defined(OS_WIN) 36 #if defined(OS_WIN)
37 #include <shellapi.h> 37 #include <shellapi.h>
38 #include "ui/base/win/shell.h" 38 #include "ui/base/win/shell.h"
39
40 #if defined(USE_AURA)
41 #include "ui/aura/remote_window_tree_host_win.h"
42 #endif
43 #endif 39 #endif
44 40
45 using base::UserMetricsAction; 41 using base::UserMetricsAction;
46 42
47 #if defined(ENABLE_PLUGIN_INSTALLATION) 43 #if defined(ENABLE_PLUGIN_INSTALLATION)
48 44
49 // OutdatedPluginInfoBarDelegate ---------------------------------------------- 45 // OutdatedPluginInfoBarDelegate ----------------------------------------------
50 46
51 void OutdatedPluginInfoBarDelegate::Create( 47 void OutdatedPluginInfoBarDelegate::Create(
52 InfoBarService* infobar_service, 48 InfoBarService* infobar_service,
(...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after
205 const base::string16& message) { 201 const base::string16& message) {
206 DCHECK(infobar->owner()); 202 DCHECK(infobar->owner());
207 infobar->owner()->ReplaceInfoBar( 203 infobar->owner()->ReplaceInfoBar(
208 infobar, 204 infobar,
209 infobar->owner()->CreateConfirmInfoBar( 205 infobar->owner()->CreateConfirmInfoBar(
210 scoped_ptr<ConfirmInfoBarDelegate>(new OutdatedPluginInfoBarDelegate( 206 scoped_ptr<ConfirmInfoBarDelegate>(new OutdatedPluginInfoBarDelegate(
211 installer, plugin_metadata.Pass(), message)))); 207 installer, plugin_metadata.Pass(), message))));
212 } 208 }
213 209
214 #endif // defined(ENABLE_PLUGIN_INSTALLATION) 210 #endif // defined(ENABLE_PLUGIN_INSTALLATION)
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698