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

« back to all changes in this revision

Viewing changes to debian/patches/2-get-domain-tld.patch

  • Committer: Saikrishna Arcot
  • Date: 2014-03-15 12:34:23 UTC
  • Revision ID: saiarcot895@gmail.com-20140315123423-gc15qxfqli956riq
Tags: 34.0.1847.60-0ubuntu1~ppa1~quantal1
* New upstream version 34.0.1847.60
* Refreshed patches

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
1
Index: beta.trusty/src/chrome/browser/extensions/api/tld/tld_api.cc
2
2
===================================================================
3
3
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
4
 
+++ beta.trusty/src/chrome/browser/extensions/api/tld/tld_api.cc        2014-03-07 17:27:40.255743659 -0500
 
4
+++ beta.trusty/src/chrome/browser/extensions/api/tld/tld_api.cc        2014-03-15 07:23:40.763057205 -0500
5
5
@@ -0,0 +1,90 @@
6
6
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
7
7
+// Use of this source code is governed by a BSD-style license that can be
96
96
Index: beta.trusty/src/chrome/browser/extensions/api/tld/tld_api.h
97
97
===================================================================
98
98
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
99
 
+++ beta.trusty/src/chrome/browser/extensions/api/tld/tld_api.h 2014-03-07 17:27:40.255743659 -0500
 
99
+++ beta.trusty/src/chrome/browser/extensions/api/tld/tld_api.h 2014-03-15 07:23:40.763057205 -0500
100
100
@@ -0,0 +1,28 @@
101
101
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
102
102
+// Use of this source code is governed by a BSD-style license that can be
128
128
+
129
129
Index: beta.trusty/src/chrome/browser/extensions/extension_function_histogram_value.h
130
130
===================================================================
131
 
--- beta.trusty.orig/src/chrome/browser/extensions/extension_function_histogram_value.h 2014-03-07 17:27:40.587755819 -0500
132
 
+++ beta.trusty/src/chrome/browser/extensions/extension_function_histogram_value.h      2014-03-07 17:27:40.315745856 -0500
 
131
--- beta.trusty.orig/src/chrome/browser/extensions/extension_function_histogram_value.h 2014-03-15 07:23:40.903056534 -0500
 
132
+++ beta.trusty/src/chrome/browser/extensions/extension_function_histogram_value.h      2014-03-15 07:23:40.779057128 -0500
133
133
@@ -556,6 +556,8 @@
134
134
   DIAGNOSTICS_SENDPACKET,
135
135
   METRICSPRIVATE_GETFIELDTRIAL,
141
141
   FILEBROWSERPRIVATE_REQUESTACCESSTOKEN,
142
142
Index: beta.trusty/src/chrome/browser/extensions/extension_function_registry.cc
143
143
===================================================================
144
 
--- beta.trusty.orig/src/chrome/browser/extensions/extension_function_registry.cc       2014-03-07 17:27:40.587755819 -0500
145
 
+++ beta.trusty/src/chrome/browser/extensions/extension_function_registry.cc    2014-03-07 17:27:40.335746589 -0500
 
144
--- beta.trusty.orig/src/chrome/browser/extensions/extension_function_registry.cc       2014-03-15 07:23:40.903056534 -0500
 
145
+++ beta.trusty/src/chrome/browser/extensions/extension_function_registry.cc    2014-03-15 07:23:40.795057051 -0500
146
146
@@ -7,6 +7,7 @@
147
147
 #include "chrome/browser/extensions/api/preference/chrome_direct_setting.h"
148
148
 #include "chrome/browser/extensions/api/preference/preference_api.h"
164
164
 #endif  // defined(ENABLE_EXTENSIONS)
165
165
Index: beta.trusty/src/chrome/chrome_browser_extensions.gypi
166
166
===================================================================
167
 
--- beta.trusty.orig/src/chrome/chrome_browser_extensions.gypi  2014-03-07 17:27:40.587755819 -0500
168
 
+++ beta.trusty/src/chrome/chrome_browser_extensions.gypi       2014-03-07 17:27:40.391748640 -0500
169
 
@@ -606,6 +606,8 @@
 
167
--- beta.trusty.orig/src/chrome/chrome_browser_extensions.gypi  2014-03-15 07:23:40.903056534 -0500
 
168
+++ beta.trusty/src/chrome/chrome_browser_extensions.gypi       2014-03-15 07:23:40.815056956 -0500
 
169
@@ -604,6 +604,8 @@
170
170
         'browser/extensions/api/tabs/windows_util.h',
171
171
         'browser/extensions/api/test/test_api.cc',
172
172
         'browser/extensions/api/test/test_api.h',
177
177
         'browser/extensions/api/usb/usb_api.cc',
178
178
Index: beta.trusty/src/chrome/common/extensions/api/_api_features.json
179
179
===================================================================
180
 
--- beta.trusty.orig/src/chrome/common/extensions/api/_api_features.json        2014-03-07 17:27:40.587755819 -0500
181
 
+++ beta.trusty/src/chrome/common/extensions/api/_api_features.json     2014-03-07 17:27:40.483752010 -0500
 
180
--- beta.trusty.orig/src/chrome/common/extensions/api/_api_features.json        2014-03-15 07:23:40.903056534 -0500
 
181
+++ beta.trusty/src/chrome/common/extensions/api/_api_features.json     2014-03-15 07:23:40.827056898 -0500
182
182
@@ -707,6 +707,10 @@
183
183
     "dependencies": ["permission:ttsEngine"],
184
184
     "contexts": ["blessed_extension"]
192
192
     "extension_types": ["extension", "legacy_packaged_app", "platform_app"],
193
193
Index: beta.trusty/src/extensions/common/extension_api.cc
194
194
===================================================================
195
 
--- beta.trusty.orig/src/extensions/common/extension_api.cc     2014-03-07 17:27:40.587755819 -0500
196
 
+++ beta.trusty/src/extensions/common/extension_api.cc  2014-03-07 17:27:40.539754060 -0500
 
195
--- beta.trusty.orig/src/extensions/common/extension_api.cc     2014-03-15 07:23:40.903056534 -0500
 
196
+++ beta.trusty/src/extensions/common/extension_api.cc  2014-03-15 07:23:40.883056629 -0500
197
197
@@ -251,6 +251,7 @@
198
198
   RegisterSchemaResource("scriptBadge", IDR_EXTENSION_API_JSON_SCRIPTBADGE);
199
199
   RegisterSchemaResource("ttsEngine", IDR_EXTENSION_API_JSON_TTSENGINE);
205
205
Index: beta.trusty/src/chrome/common/extensions/api/tld.json
206
206
===================================================================
207
207
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
208
 
+++ beta.trusty/src/chrome/common/extensions/api/tld.json       2014-03-07 17:27:40.555754647 -0500
 
208
+++ beta.trusty/src/chrome/common/extensions/api/tld.json       2014-03-15 07:23:40.883056629 -0500
209
209
@@ -0,0 +1,57 @@
210
210
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
211
211
+// Use of this source code is governed by a BSD-style license that can be
266
266
+]
267
267
Index: beta.trusty/src/chrome/common/extensions_api_resources.grd
268
268
===================================================================
269
 
--- beta.trusty.orig/src/chrome/common/extensions_api_resources.grd     2014-03-07 17:27:40.587755819 -0500
270
 
+++ beta.trusty/src/chrome/common/extensions_api_resources.grd  2014-03-07 17:27:40.583755672 -0500
 
269
--- beta.trusty.orig/src/chrome/common/extensions_api_resources.grd     2014-03-15 07:23:40.903056534 -0500
 
270
+++ beta.trusty/src/chrome/common/extensions_api_resources.grd  2014-03-15 07:23:40.895056573 -0500
271
271
@@ -25,6 +25,7 @@
272
272
       <include name="IDR_EXTENSION_API_JSON_RUNTIME" file="extensions\api\runtime.json" type="BINDATA" />
273
273
       <include name="IDR_EXTENSION_API_JSON_SCRIPTBADGE" file="extensions\api\script_badge.json" type="BINDATA" />