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

Side by Side Diff: chrome/browser/pepper_broker_observer.cc

Issue 10987054: Switch PepperBrokerObserver to use WebContentsUserData. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 2 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
« no previous file with comments | « chrome/browser/pepper_broker_observer.h ('k') | chrome/browser/ui/tab_contents/tab_contents.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/pepper_broker_observer.h" 5 #include "chrome/browser/pepper_broker_observer.h"
6 6
7 #include "chrome/browser/api/infobars/confirm_infobar_delegate.h" 7 #include "chrome/browser/api/infobars/confirm_infobar_delegate.h"
8 #include "chrome/browser/content_settings/host_content_settings_map.h" 8 #include "chrome/browser/content_settings/host_content_settings_map.h"
9 #include "chrome/browser/infobars/infobar_tab_helper.h" 9 #include "chrome/browser/infobars/infobar_tab_helper.h"
10 #include "chrome/browser/plugins/plugin_finder.h" 10 #include "chrome/browser/plugins/plugin_finder.h"
(...skipping 12 matching lines...) Expand all
23 #include "net/base/net_util.h" 23 #include "net/base/net_util.h"
24 #include "ui/base/l10n/l10n_util.h" 24 #include "ui/base/l10n/l10n_util.h"
25 #include "ui/base/resource/resource_bundle.h" 25 #include "ui/base/resource/resource_bundle.h"
26 #include "webkit/plugins/npapi/plugin_list.h" 26 #include "webkit/plugins/npapi/plugin_list.h"
27 #include "webkit/plugins/webplugininfo.h" 27 #include "webkit/plugins/webplugininfo.h"
28 28
29 using content::OpenURLParams; 29 using content::OpenURLParams;
30 using content::Referrer; 30 using content::Referrer;
31 using content::WebContents; 31 using content::WebContents;
32 32
33 int PepperBrokerObserver::kUserDataKey;
34
33 namespace { 35 namespace {
34 36
35 // The URL for the "learn more" article about the PPAPI broker. 37 // The URL for the "learn more" article about the PPAPI broker.
36 const char kPpapiBrokerLearnMoreUrl[] = 38 const char kPpapiBrokerLearnMoreUrl[] =
37 "https://support.google.com/chrome/?p=ib_pepper_broker"; 39 "https://support.google.com/chrome/?p=ib_pepper_broker";
38 40
39 class PepperBrokerInfoBarDelegate : public ConfirmInfoBarDelegate { 41 class PepperBrokerInfoBarDelegate : public ConfirmInfoBarDelegate {
40 public: 42 public:
41 static void Show( 43 static void Show(
42 content::WebContents* web_contents, 44 content::WebContents* web_contents,
(...skipping 178 matching lines...) Expand 10 before | Expand all | Expand 10 after
221 infobar_helper, url, plugin_path, languages, content_settings, 223 infobar_helper, url, plugin_path, languages, content_settings,
222 callback)); 224 callback));
223 break; 225 break;
224 } 226 }
225 default: 227 default:
226 NOTREACHED(); 228 NOTREACHED();
227 } 229 }
228 230
229 return true; 231 return true;
230 } 232 }
OLDNEW
« no previous file with comments | « chrome/browser/pepper_broker_observer.h ('k') | chrome/browser/ui/tab_contents/tab_contents.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698