~saiarcot895/chromium-browser/chromium-browser.utopic.beta

« back to all changes in this revision

Viewing changes to debian/patches/7-npapi-permission-not-defaults-to-unauthorized.patch

  • Committer: Saikrishna Arcot
  • Date: 2015-04-13 12:31:05 UTC
  • Revision ID: saiarcot895@gmail.com-20150413123105-emrcclraqd1t94yw
Tags: 42.0.2311.82-0ubuntu1~ppa1~utopic1
* New upstream version 42.0.2311.82
* Refreshed and updated patches

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
1
Index: beta.vivid/chrome/browser/browser_resources.grd
2
2
===================================================================
3
 
--- beta.vivid.orig/chrome/browser/browser_resources.grd        2015-03-27 08:28:00.247546718 -0400
4
 
+++ beta.vivid/chrome/browser/browser_resources.grd     2015-03-27 08:28:00.244546766 -0400
 
3
--- beta.vivid.orig/chrome/browser/browser_resources.grd        2015-04-13 08:30:23.373756148 -0400
 
4
+++ beta.vivid/chrome/browser/browser_resources.grd     2015-04-13 08:30:23.348756500 -0400
5
5
@@ -231,6 +231,7 @@
6
6
       </if>
7
7
       <if expr="desktop_linux or (is_android and enable_plugins)">
12
12
         <include name="IDR_POLICY_CSS" file="resources\policy_android.css" type="BINDATA"/>
13
13
Index: beta.vivid/chrome/browser/plugins/plugin_finder.cc
14
14
===================================================================
15
 
--- beta.vivid.orig/chrome/browser/plugins/plugin_finder.cc     2015-03-27 08:28:00.247546718 -0400
16
 
+++ beta.vivid/chrome/browser/plugins/plugin_finder.cc  2015-03-27 08:28:00.245546750 -0400
 
15
--- beta.vivid.orig/chrome/browser/plugins/plugin_finder.cc     2015-04-13 08:30:23.373756148 -0400
 
16
+++ beta.vivid/chrome/browser/plugins/plugin_finder.cc  2015-04-13 08:30:23.350756471 -0400
17
17
@@ -128,6 +128,29 @@
18
18
   return plugin;
19
19
 }
116
116
 
117
117
Index: beta.vivid/chrome/browser/plugins/plugin_finder.h
118
118
===================================================================
119
 
--- beta.vivid.orig/chrome/browser/plugins/plugin_finder.h      2015-03-27 08:28:00.247546718 -0400
120
 
+++ beta.vivid/chrome/browser/plugins/plugin_finder.h   2015-03-27 08:28:00.245546750 -0400
 
119
--- beta.vivid.orig/chrome/browser/plugins/plugin_finder.h      2015-04-13 08:30:23.373756148 -0400
 
120
+++ beta.vivid/chrome/browser/plugins/plugin_finder.h   2015-04-13 08:30:23.350756471 -0400
121
121
@@ -80,6 +80,15 @@
122
122
   // Returns NULL if the plug-in list couldn't be parsed.
123
123
   static base::DictionaryValue* LoadBuiltInPluginList();
137
137
Index: beta.vivid/chrome/browser/resources/plugin_metadata/plugins_ubuntu_linux.json
138
138
===================================================================
139
139
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
140
 
+++ beta.vivid/chrome/browser/resources/plugin_metadata/plugins_ubuntu_linux.json       2015-03-27 08:28:00.245546750 -0400
 
140
+++ beta.vivid/chrome/browser/resources/plugin_metadata/plugins_ubuntu_linux.json       2015-04-13 08:30:23.357756372 -0400
141
141
@@ -0,0 +1,18 @@
142
142
+{
143
143
+  "libunity_npapi_plugin.so": {