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

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

Issue 19894003: Move webplugininfo.h to content/public. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 7 years, 5 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 | Annotate | Revision Log
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_observer.h" 5 #include "chrome/browser/plugins/plugin_observer.h"
6 6
7 #include "base/auto_reset.h" 7 #include "base/auto_reset.h"
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "base/debug/crash_logging.h" 9 #include "base/debug/crash_logging.h"
10 #include "base/metrics/histogram.h" 10 #include "base/metrics/histogram.h"
(...skipping 11 matching lines...) Expand all
22 #include "chrome/browser/plugins/plugin_infobar_delegates.h" 22 #include "chrome/browser/plugins/plugin_infobar_delegates.h"
23 #include "chrome/browser/profiles/profile.h" 23 #include "chrome/browser/profiles/profile.h"
24 #include "chrome/browser/ui/tab_modal_confirm_dialog.h" 24 #include "chrome/browser/ui/tab_modal_confirm_dialog.h"
25 #include "chrome/common/render_messages.h" 25 #include "chrome/common/render_messages.h"
26 #include "chrome/common/url_constants.h" 26 #include "chrome/common/url_constants.h"
27 #include "content/public/browser/plugin_service.h" 27 #include "content/public/browser/plugin_service.h"
28 #include "content/public/browser/render_view_host.h" 28 #include "content/public/browser/render_view_host.h"
29 #include "content/public/browser/web_contents.h" 29 #include "content/public/browser/web_contents.h"
30 #include "content/public/browser/web_contents_delegate.h" 30 #include "content/public/browser/web_contents_delegate.h"
31 #include "content/public/browser/web_contents_view.h" 31 #include "content/public/browser/web_contents_view.h"
32 #include "content/public/common/webplugininfo.h"
32 #include "grit/generated_resources.h" 33 #include "grit/generated_resources.h"
33 #include "grit/theme_resources.h" 34 #include "grit/theme_resources.h"
34 #include "ui/base/l10n/l10n_util.h" 35 #include "ui/base/l10n/l10n_util.h"
35 #include "webkit/plugins/webplugininfo.h"
36 36
37 #if defined(ENABLE_PLUGIN_INSTALLATION) 37 #if defined(ENABLE_PLUGIN_INSTALLATION)
38 #if defined(OS_WIN) 38 #if defined(OS_WIN)
39 #include "base/win/metro.h" 39 #include "base/win/metro.h"
40 #endif 40 #endif
41 #include "chrome/browser/plugins/plugin_installer.h" 41 #include "chrome/browser/plugins/plugin_installer.h"
42 #include "chrome/browser/plugins/plugin_installer_observer.h" 42 #include "chrome/browser/plugins/plugin_installer_observer.h"
43 #include "chrome/browser/ui/tab_modal_confirm_dialog_delegate.h" 43 #include "chrome/browser/ui/tab_modal_confirm_dialog_delegate.h"
44 #endif // defined(ENABLE_PLUGIN_INSTALLATION) 44 #endif // defined(ENABLE_PLUGIN_INSTALLATION)
45 45
(...skipping 358 matching lines...) Expand 10 before | Expand all | Expand 10 after
404 scoped_ptr<PluginMetadata> plugin; 404 scoped_ptr<PluginMetadata> plugin;
405 bool ret = PluginFinder::GetInstance()->FindPluginWithIdentifier( 405 bool ret = PluginFinder::GetInstance()->FindPluginWithIdentifier(
406 identifier, NULL, &plugin); 406 identifier, NULL, &plugin);
407 DCHECK(ret); 407 DCHECK(ret);
408 408
409 PluginMetroModeInfoBarDelegate::Create( 409 PluginMetroModeInfoBarDelegate::Create(
410 InfoBarService::FromWebContents(web_contents()), 410 InfoBarService::FromWebContents(web_contents()),
411 PluginMetroModeInfoBarDelegate::DESKTOP_MODE_REQUIRED, plugin->name()); 411 PluginMetroModeInfoBarDelegate::DESKTOP_MODE_REQUIRED, plugin->name());
412 #endif 412 #endif
413 } 413 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698