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

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

Issue 10933044: Move chrome/browser/plugin_* to chrome/browser/plugins/ (Closed) Base URL: http://git.chromium.org/chromium/src.git@remove_plugin_group
Patch Set: . Created 8 years, 3 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/plugin_infobar_delegates.h" 5 #include "chrome/browser/plugins/plugin_infobar_delegates.h"
6 6
7 #include "base/utf_string_conversions.h" 7 #include "base/utf_string_conversions.h"
8 #include "chrome/browser/api/infobars/infobar_service.h" 8 #include "chrome/browser/api/infobars/infobar_service.h"
9 #include "chrome/browser/content_settings/host_content_settings_map.h" 9 #include "chrome/browser/content_settings/host_content_settings_map.h"
10 #include "chrome/browser/google/google_util.h" 10 #include "chrome/browser/google/google_util.h"
11 #include "chrome/browser/lifetime/application_lifetime.h" 11 #include "chrome/browser/lifetime/application_lifetime.h"
12 #include "chrome/browser/plugin_observer.h" 12 #include "chrome/browser/plugins/plugin_observer.h"
13 #include "chrome/browser/ui/tab_contents/tab_contents.h" 13 #include "chrome/browser/ui/tab_contents/tab_contents.h"
14 #include "chrome/common/render_messages.h" 14 #include "chrome/common/render_messages.h"
15 #include "chrome/common/url_constants.h" 15 #include "chrome/common/url_constants.h"
16 #include "content/public/browser/render_view_host.h" 16 #include "content/public/browser/render_view_host.h"
17 #include "content/public/browser/user_metrics.h" 17 #include "content/public/browser/user_metrics.h"
18 #include "content/public/browser/web_contents.h" 18 #include "content/public/browser/web_contents.h"
19 #include "grit/generated_resources.h" 19 #include "grit/generated_resources.h"
20 #include "grit/locale_settings.h" 20 #include "grit/locale_settings.h"
21 #include "grit/theme_resources.h" 21 #include "grit/theme_resources.h"
22 #include "ui/base/l10n/l10n_util.h" 22 #include "ui/base/l10n/l10n_util.h"
23 #include "ui/base/resource/resource_bundle.h" 23 #include "ui/base/resource/resource_bundle.h"
24 #include "webkit/plugins/npapi/plugin_group.h" 24 #include "webkit/plugins/npapi/plugin_group.h"
25 25
26 #if defined(OS_WIN) 26 #if defined(OS_WIN)
27 #include <shellapi.h> 27 #include <shellapi.h>
28 #include "ui/base/win/shell.h" 28 #include "ui/base/win/shell.h"
29 #endif 29 #endif
30 30
31 #if defined(ENABLE_PLUGIN_INSTALLATION) 31 #if defined(ENABLE_PLUGIN_INSTALLATION)
32 #include "chrome/browser/plugin_installer.h" 32 #include "chrome/browser/plugins/plugin_installer.h"
33 #endif // defined(ENABLE_PLUGIN_INSTALLATION) 33 #endif // defined(ENABLE_PLUGIN_INSTALLATION)
34 34
35 using content::OpenURLParams; 35 using content::OpenURLParams;
36 using content::Referrer; 36 using content::Referrer;
37 using content::UserMetricsAction; 37 using content::UserMetricsAction;
38 38
39 PluginInfoBarDelegate::PluginInfoBarDelegate(InfoBarService* infobar_service, 39 PluginInfoBarDelegate::PluginInfoBarDelegate(InfoBarService* infobar_service,
40 const string16& name, 40 const string16& name,
41 const std::string& identifier) 41 const std::string& identifier)
42 : ConfirmInfoBarDelegate(infobar_service), 42 : ConfirmInfoBarDelegate(infobar_service),
(...skipping 439 matching lines...) Expand 10 before | Expand all | Expand 10 after
482 "https://support.google.com/chrome/?ib_display_in_desktop")); 482 "https://support.google.com/chrome/?ib_display_in_desktop"));
483 OpenURLParams params( 483 OpenURLParams params(
484 url, Referrer(), 484 url, Referrer(),
485 (disposition == CURRENT_TAB) ? NEW_FOREGROUND_TAB : disposition, 485 (disposition == CURRENT_TAB) ? NEW_FOREGROUND_TAB : disposition,
486 content::PAGE_TRANSITION_LINK, false); 486 content::PAGE_TRANSITION_LINK, false);
487 owner()->GetWebContents()->OpenURL(params); 487 owner()->GetWebContents()->OpenURL(params);
488 return false; 488 return false;
489 } 489 }
490 #endif // defined(OS_WIN) 490 #endif // defined(OS_WIN)
491 #endif // defined(ENABLE_PLUGIN_INSTALLATION) 491 #endif // defined(ENABLE_PLUGIN_INSTALLATION)
OLDNEW
« no previous file with comments | « chrome/browser/plugins/plugin_infobar_delegates.h ('k') | chrome/browser/plugins/plugin_installer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698