← Back to branch summary

~cmiller/chromium-browser/ppa-chromium-browser.raring.beta

« back to all changes in this revision

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

  • Committer: Chad Miller
  • Date: 2013-04-05 12:25:19 UTC
  • mfrom: (798.1.49 p-raring)
  • Revision ID: chad.miller@canonical.com-20130405122519-l2t4795yqcq8gypl
* New beta version 27.0.1453.15.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/2-get-domain-tld.patch
1
 
--- /dev/null
2
 
+++ b/src/chrome/browser/extensions/api/tld/tld_api.cc
 
1
Index: src/chrome/browser/extensions/api/tld/tld_api.cc
 
2
===================================================================
 
3
--- src/chrome/browser/extensions/api/tld/tld_api.cc    (revision 0)
 
4
+++ src/chrome/browser/extensions/api/tld/tld_api.cc    (revision 0)
3
5
@@ -0,0 +1,88 @@
4
6
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
5
7
+// Use of this source code is governed by a BSD-style license that can be
89
91
+}
90
92
+
91
93
+
92
 
--- /dev/null
93
 
+++ b/src/chrome/browser/extensions/api/tld/tld_api.h
 
94
Index: src/chrome/browser/extensions/api/tld/tld_api.h
 
95
===================================================================
 
96
--- src/chrome/browser/extensions/api/tld/tld_api.h     (revision 0)
 
97
+++ src/chrome/browser/extensions/api/tld/tld_api.h     (revision 0)
94
98
@@ -0,0 +1,26 @@
95
99
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
96
100
+// Use of this source code is governed by a BSD-style license that can be
106
110
+ public:
107
111
+  virtual ~TldGetBaseDomainFunction() {}
108
112
+  virtual bool RunImpl() OVERRIDE;
109
 
+  DECLARE_EXTENSION_FUNCTION_NAME("tld.getBaseDomain");
 
113
+  DECLARE_EXTENSION_FUNCTION("tld.getBaseDomain",TLD_GET_BASE_DOMAIN);
110
114
+};
111
115
+
112
116
+class TldGetPublicSuffix : public SyncExtensionFunction {
113
117
+ public:
114
118
+  virtual ~TldGetPublicSuffix() {}
115
119
+  virtual bool RunImpl() OVERRIDE;
116
 
+  DECLARE_EXTENSION_FUNCTION_NAME("tld.getPublicSuffix");
 
120
+  DECLARE_EXTENSION_FUNCTION("tld.getPublicSuffix",TLD_GET_PUBLIC_SUFFIX);
117
121
+};
118
122
+
119
123
+#endif  // CHROME_BROWSER_EXTENSIONS_API_TLD_TLD_API_H_
120
124
+
121
 
--- a/src/chrome/chrome_browser_extensions.gypi
122
 
+++ b/src/chrome/chrome_browser_extensions.gypi
123
 
@@ -386,6 +386,8 @@
124
 
         'browser/extensions/api/terminal/terminal_private_api.h',
 
125
Index: src/chrome/chrome_browser_extensions.gypi
 
126
===================================================================
 
127
--- src/chrome/chrome_browser_extensions.gypi   (revision 189671)
 
128
+++ src/chrome/chrome_browser_extensions.gypi   (working copy)
 
129
@@ -413,6 +413,8 @@
 
130
         'browser/extensions/api/tabs/windows_event_router.h',
125
131
         'browser/extensions/api/test/test_api.cc',
126
132
         'browser/extensions/api/test/test_api.h',
127
133
+        'browser/extensions/api/tld/tld_api.cc',
129
135
         'browser/extensions/api/top_sites/top_sites_api.cc',
130
136
         'browser/extensions/api/top_sites/top_sites_api.h',
131
137
         'browser/extensions/api/usb/usb_api.cc',
132
 
--- a/src/chrome/common/extensions_api_resources.grd
133
 
+++ b/src/chrome/common/extensions_api_resources.grd
134
 
@@ -63,6 +63,7 @@
135
 
       <include name="IDR_EXTENSION_API_JSON_TABS" file="extensions\api\tabs.json" type="BINDATA" />
 
138
Index: src/chrome/common/extensions_api_resources.grd
 
139
===================================================================
 
140
--- src/chrome/common/extensions_api_resources.grd      (revision 189671)
 
141
+++ src/chrome/common/extensions_api_resources.grd      (working copy)
 
142
@@ -47,6 +47,7 @@
 
143
       <include name="IDR_EXTENSION_API_JSON_SYSTEMPRIVATE" file="extensions\api\system_private.json" type="BINDATA" />
136
144
       <include name="IDR_EXTENSION_API_JSON_TERMINALPRIVATE" file="extensions\api\terminal_private.json" type="BINDATA" />
137
145
       <include name="IDR_EXTENSION_API_JSON_TEST" file="extensions\api\test.json" type="BINDATA" />
138
146
+      <include name="IDR_EXTENSION_API_JSON_TLD" file="extensions\api\tld.json" type="BINDATA" />
139
147
       <include name="IDR_EXTENSION_API_JSON_TOPSITES" file="extensions\api\top_sites.json" type="BINDATA" />
140
148
       <include name="IDR_EXTENSION_API_JSON_TTS" file="extensions\api\tts.json" type="BINDATA" />
141
149
       <include name="IDR_EXTENSION_API_JSON_TTSENGINE" file="extensions\api\tts_engine.json" type="BINDATA" />
142
 
--- a/src/chrome/common/extensions/permissions/permission_set.cc
143
 
+++ b/src/chrome/common/extensions/permissions/permission_set.cc
144
 
@@ -52,6 +52,7 @@
 
150
Index: src/chrome/common/extensions/permissions/permission_set.cc
 
151
===================================================================
 
152
--- src/chrome/common/extensions/permissions/permission_set.cc  (revision 189671)
 
153
+++ src/chrome/common/extensions/permissions/permission_set.cc  (working copy)
 
154
@@ -53,6 +54,7 @@
145
155
   "scriptBadge",
146
156
   "tabs",
147
157
   "test",
149
159
   "types",
150
160
   "windows"
151
161
 };
152
 
--- a/src/chrome/common/extensions/api/extension_api.cc
153
 
+++ b/src/chrome/common/extensions/api/extension_api.cc
154
 
@@ -450,6 +450,8 @@
 
162
Index: src/chrome/common/extensions/api/extension_api.cc
 
163
===================================================================
 
164
--- src/chrome/common/extensions/api/extension_api.cc   (revision 189671)
 
165
+++ src/chrome/common/extensions/api/extension_api.cc   (working copy)
 
166
@@ -418,6 +418,8 @@
155
167
       IDR_EXTENSION_API_JSON_TERMINALPRIVATE));
156
168
   RegisterSchema("test", ReadFromResource(
157
169
       IDR_EXTENSION_API_JSON_TEST));
160
172
   RegisterSchema("topSites", ReadFromResource(
161
173
       IDR_EXTENSION_API_JSON_TOPSITES));
162
174
   RegisterSchema("ttsEngine", ReadFromResource(
163
 
--- /dev/null
164
 
+++ b/src/chrome/common/extensions/api/tld.json
 
175
Index: src/chrome/common/extensions/api/tld.json
 
176
===================================================================
 
177
--- src/chrome/common/extensions/api/tld.json   (revision 0)
 
178
+++ src/chrome/common/extensions/api/tld.json   (revision 0)
165
179
@@ -0,0 +1,53 @@
166
180
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
167
181
+// Use of this source code is governed by a BSD-style license that can be
216
230
+  }
217
231
+
218
232
+]
219
 
--- a/src/chrome/browser/extensions/extension_function_registry.cc
220
 
+++ b/src/chrome/browser/extensions/extension_function_registry.cc
221
 
@@ -39,6 +39,7 @@
222
 
 #include "chrome/browser/extensions/api/tabs/execute_code_in_tab_function.h"
223
 
 #include "chrome/browser/extensions/api/tabs/tabs.h"
 
233
Index: src/chrome/browser/extensions/extension_function_histogram_value.h
 
234
===================================================================
 
235
--- src/chrome/browser/extensions/extension_function_histogram_value.h  (revision 189671)
 
236
+++ src/chrome/browser/extensions/extension_function_histogram_value.h  (working copy)
 
237
@@ -60,6 +60,8 @@
 
238
 //
 
239
 enum HistogramValue {
 
240
   UNKNOWN = 0,
 
241
+  TLD_GET_BASE_DOMAIN,
 
242
+  TLD_GET_PUBLIC_SUFFIX,
 
243
   WEBNAVIGATION_GETALLFRAMES,
 
244
   BROWSINGDATA_REMOVEWEBSQL,
 
245
   ALARMS_CREATE,
 
246
Index: src/chrome/browser/extensions/extension_function_registry.cc
 
247
===================================================================
 
248
--- src/chrome/browser/extensions/extension_function_registry.cc        (revision 189671)
 
249
+++ src/chrome/browser/extensions/extension_function_registry.cc        (working copy)
 
250
@@ -17,6 +17,7 @@
 
251
 #include "chrome/browser/extensions/api/preference/preference_api.h"
 
252
 #include "chrome/browser/extensions/api/runtime/runtime_api.h"
224
253
 #include "chrome/browser/extensions/api/test/test_api.h"
225
254
+#include "chrome/browser/extensions/api/tld/tld_api.h"
226
255
 #include "chrome/browser/extensions/api/top_sites/top_sites_api.h"
227
 
 #include "chrome/browser/extensions/api/web_navigation/web_navigation_api.h"
228
256
 #include "chrome/browser/extensions/api/web_request/web_request_api.h"
229
 
@@ -256,6 +257,10 @@
230
 
   RegisterFunction<ExtensionTtsSpeakFunction>();
231
 
   RegisterFunction<ExtensionTtsStopSpeakingFunction>();
 
257
 #include "chrome/browser/extensions/api/web_socket_proxy_private/web_socket_proxy_private_api.h"
 
258
@@ -204,6 +206,10 @@
 
259
   RegisterFunction<extensions::AppNotifyFunction>();
 
260
   RegisterFunction<extensions::AppClearAllNotificationsFunction>();
232
261
 
233
262
+  // TLD.
234
263
+  RegisterFunction<TldGetBaseDomainFunction>();
235
264
+  RegisterFunction<TldGetPublicSuffix>();
236
265
+
237
 
   // Commands.
238
 
   RegisterFunction<GetAllCommandsFunction>();
 
266
   // TopSites
 
267
   RegisterFunction<extensions::GetTopSitesFunction>();
 
268
 
239
269