diff options
Diffstat (limited to 'chrome')
21 files changed, 16 insertions, 192 deletions
diff --git a/chrome/browser/debugger/extension_ports_remote_service.cc b/chrome/browser/debugger/extension_ports_remote_service.cc index cf46fb8..d40a7d8 100644 --- a/chrome/browser/debugger/extension_ports_remote_service.cc +++ b/chrome/browser/debugger/extension_ports_remote_service.cc @@ -316,7 +316,7 @@ void ExtensionPortsRemoteService::ConnectCommand( DCHECK(service_); port_id = service_->OpenSpecialChannelToTab( extension_id, channel_name, tab_contents, this); - } else { // no tab: channel to an extension' background page / toolstrip. + } else { // no tab: channel to an extension page. // Ask the ExtensionMessageService to open the channel. VLOG(1) << "Connect: extension_id <" << extension_id << ">, channel_name <" << channel_name << ">"; diff --git a/chrome/browser/extensions/extension_browsertests_misc.cc b/chrome/browser/extensions/extension_browsertests_misc.cc index d4885c6..f2a8cb0 100644 --- a/chrome/browser/extensions/extension_browsertests_misc.cc +++ b/chrome/browser/extensions/extension_browsertests_misc.cc @@ -595,7 +595,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, LastError) { ASSERT_TRUE(LoadExtension( test_data_dir_.AppendASCII("browsertest").AppendASCII("last_error"))); - // Get the ExtensionHost that is hosting our toolstrip page. + // Get the ExtensionHost that is hosting our background page. ExtensionProcessManager* manager = browser()->profile()->GetExtensionProcessManager(); ExtensionHost* host = FindHostWithPath(manager, "/bg.html", 1); diff --git a/chrome/browser/extensions/extension_message_service.h b/chrome/browser/extensions/extension_message_service.h index 380e3a9..c5adb86 100644 --- a/chrome/browser/extensions/extension_message_service.h +++ b/chrome/browser/extensions/extension_message_service.h @@ -25,8 +25,8 @@ class TabContents; // open channels. // // Messaging works this way: -// - An extension-owned script context (like a toolstrip or a content script) -// adds an event listener to the "onConnect" event. +// - An extension-owned script context (like a background page or a content +// script) adds an event listener to the "onConnect" event. // - Another context calls "extension.connect()" to open a channel to the // extension process, or an extension context calls "tabs.connect(tabId)" to // open a channel to the content scripts for the given tab. The EMS notifies @@ -49,7 +49,8 @@ class ExtensionMessageService public NotificationObserver { public: // A messaging channel. Note that the opening port can be the same as the - // receiver, if an extension toolstrip wants to talk to its tab (for example). + // receiver, if an extension background page wants to talk to its tab (for + // example). struct MessageChannel; struct MessagePort; diff --git a/chrome/browser/extensions/extension_prefs.h b/chrome/browser/extensions/extension_prefs.h index f88812b..994a6a6 100644 --- a/chrome/browser/extensions/extension_prefs.h +++ b/chrome/browser/extensions/extension_prefs.h @@ -92,13 +92,6 @@ class ExtensionPrefs : public ExtensionContentSettingsStore::Observer { // ExtensionService::IsExtensionEnabled instead. bool IsExtensionDisabled(const std::string& id) const; - // Get the order that toolstrip URLs appear in the shelf. - typedef std::vector<GURL> URLList; - URLList GetShelfToolstripOrder(); - - // Sets the order that toolstrip URLs appear in the shelf. - void SetShelfToolstripOrder(const URLList& urls); - // Get the order that the browser actions appear in the toolbar. std::vector<std::string> GetToolbarOrder(); @@ -527,9 +520,6 @@ class ExtensionPrefs : public ExtensionContentSettingsStore::Observer { scoped_refptr<ExtensionContentSettingsStore> content_settings_store_; - // The URLs of all of the toolstrips. - URLList shelf_order_; - DISALLOW_COPY_AND_ASSIGN(ExtensionPrefs); }; diff --git a/chrome/browser/extensions/extension_process_manager_unittest.cc b/chrome/browser/extensions/extension_process_manager_unittest.cc index 4f7aef2..025fb4c1 100644 --- a/chrome/browser/extensions/extension_process_manager_unittest.cc +++ b/chrome/browser/extensions/extension_process_manager_unittest.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -42,7 +42,7 @@ TEST_F(ExtensionProcessManagerTest, ProcessGrouping) { // Extensions with common origins ("scheme://id/") should be grouped in the // same SiteInstance. GURL ext1_url1("chrome-extension://ext1_id/index.html"); - GURL ext1_url2("chrome-extension://ext1_id/toolstrips/toolstrip.html"); + GURL ext1_url2("chrome-extension://ext1_id/monkey/monkey.html"); GURL ext2_url1("chrome-extension://ext2_id/index.html"); scoped_refptr<SiteInstance> site11 = diff --git a/chrome/browser/ui/cocoa/extensions/extension_popup_controller.mm b/chrome/browser/ui/cocoa/extensions/extension_popup_controller.mm index a42aa3d..a42c63e 100644 --- a/chrome/browser/ui/cocoa/extensions/extension_popup_controller.mm +++ b/chrome/browser/ui/cocoa/extensions/extension_popup_controller.mm @@ -99,8 +99,6 @@ class DevtoolsNotificationBridge : public NotificationObserver { return nil; [view setArrowLocation:arrowLocation]; - host->view()->set_is_toolstrip(NO); - extensionView_ = host->view()->native_view(); NSNotificationCenter* center = [NSNotificationCenter defaultCenter]; [center addObserver:self diff --git a/chrome/browser/ui/cocoa/extensions/extension_view_mac.h b/chrome/browser/ui/cocoa/extensions/extension_view_mac.h index bb87ebf..abcc31e 100644 --- a/chrome/browser/ui/cocoa/extensions/extension_view_mac.h +++ b/chrome/browser/ui/cocoa/extensions/extension_view_mac.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -35,10 +35,6 @@ class ExtensionViewMac { // Returns the browser the extension belongs to. Browser* browser() const { return browser_; } - // Does this extension live as a toolstrip in an extension shelf? - bool is_toolstrip() const { return is_toolstrip_; } - void set_is_toolstrip(bool is_toolstrip) { is_toolstrip_ = is_toolstrip; } - // Sets the extensions's background image. void SetBackground(const SkBitmap& background); @@ -67,9 +63,6 @@ class ExtensionViewMac { void CreateWidgetHostView(); - // True if the contents are being displayed inside the extension shelf. - bool is_toolstrip_; - Browser* browser_; // weak ExtensionHost* extension_host_; // weak diff --git a/chrome/browser/ui/cocoa/extensions/extension_view_mac.mm b/chrome/browser/ui/cocoa/extensions/extension_view_mac.mm index 9b7c20c..d3b057e 100644 --- a/chrome/browser/ui/cocoa/extensions/extension_view_mac.mm +++ b/chrome/browser/ui/cocoa/extensions/extension_view_mac.mm @@ -16,8 +16,7 @@ const CGFloat ExtensionViewMac::kMaxHeight = 600.0; ExtensionViewMac::ExtensionViewMac(ExtensionHost* extension_host, Browser* browser) - : is_toolstrip_(true), - browser_(browser), + : browser_(browser), extension_host_(extension_host), render_widget_host_view_(NULL) { DCHECK(extension_host_); diff --git a/chrome/browser/ui/views/detachable_toolbar_view.h b/chrome/browser/ui/views/detachable_toolbar_view.h index 9f69bf1..67fddcd 100644 --- a/chrome/browser/ui/views/detachable_toolbar_view.h +++ b/chrome/browser/ui/views/detachable_toolbar_view.h @@ -57,8 +57,8 @@ class DetachableToolbarView : public AccessiblePaneView { DetachableToolbarView* view); // Paint the background of the content area (the surface behind the - // bookmarks or extension toolstrips). |rect| is the rectangle to paint - // the background within. |roundness| describes the roundness of the corners. + // bookmarks). |rect| is the rectangle to paint the background within. + // |roundness| describes the roundness of the corners. static void PaintContentAreaBackground(gfx::Canvas* canvas, ui::ThemeProvider* theme_provider, const SkRect& rect, diff --git a/chrome/browser/ui/webui/options/extension_settings_handler.h b/chrome/browser/ui/webui/options/extension_settings_handler.h index f0bfdf0..270adc9 100644 --- a/chrome/browser/ui/webui/options/extension_settings_handler.h +++ b/chrome/browser/ui/webui/options/extension_settings_handler.h @@ -32,7 +32,7 @@ class DictionaryValue; class ListValue; } -// Information about a page running in an extension, for example a toolstrip, +// Information about a page running in an extension, for example a popup bubble, // a background page, or a tab contents. struct ExtensionPage { ExtensionPage(const GURL& url, int render_process_id, int render_view_id, diff --git a/chrome/common/extensions/api/extension_api.json b/chrome/common/extensions/api/extension_api.json index 08a5ee8..58472ef 100644 --- a/chrome/common/extensions/api/extension_api.json +++ b/chrome/common/extensions/api/extension_api.json @@ -160,20 +160,6 @@ } }, { - "name": "getToolstrips", - "nodoc": true, - "type": "function", - "description": "Deprecated. Please use getViews({type: 'TOOLSTRIP'}). Returns an array of the JavaScript 'window' objects for each of the toolstrip views running inside the current extension. If windowId is specified, returns only the 'window' objects of toolstrips attached to the specified window.", - "parameters": [ - {"type": "integer", "name": "windowId", "optional": true} - ], - "returns": { - "type": "array", - "description": "Array of global window objects", - "items": { "type": "object", "isInstanceOf": "DOMWindow", "properties": {}, "additionalProperties": { "type": "any" } } - } - }, - { "name": "getExtensionTabs", "nodoc": true, "type": "function", diff --git a/chrome/common/extensions/docs/extension.html b/chrome/common/extensions/docs/extension.html index ca77e2b..686a07c 100644 --- a/chrome/common/extensions/docs/extension.html +++ b/chrome/common/extensions/docs/extension.html @@ -287,8 +287,6 @@ <a href="#method-getBackgroundPage">getBackgroundPage</a> </li><li style="display: none; "> <a href="#method-anchor">methodName</a> - </li><li style="display: none; "> - <a href="#method-anchor">methodName</a> </li><li> <a href="#method-getURL">getURL</a> </li><li> @@ -1151,72 +1149,6 @@ For details, see </p> </div> <!-- /description --> - </div><div class="apiItem" style="display: none; "> - <a></a> <!-- method-anchor --> - <h4>method name</h4> - - <div class="summary"><span>void</span> - <!-- Note: intentionally longer 80 columns --> - <span>chrome.module.methodName</span>(<span><span>, </span><span></span> - <var><span></span></var></span>)</div> - - <div class="description"> - <p class="todo">Undocumented.</p> - <p> - A description from the json schema def of the function goes here. - </p> - - <!-- PARAMETERS --> - <h4>Parameters</h4> - <dl> - <div> - <div> - </div> - </div> - </dl> - - <!-- RETURNS --> - <h4>Returns</h4> - <dl> - <div> - <div> - </div> - </div> - </dl> - - <!-- CALLBACK --> - <div> - <div> - <h4>Callback function</h4> - <p> - The callback <em>parameter</em> should specify a function - that looks like this: - </p> - <p> - If you specify the <em>callback</em> parameter, it should - specify a function that looks like this: - </p> - - <!-- Note: intentionally longer 80 columns --> - <pre>function(<span>Type param1, Type param2</span>) <span class="subdued">{...}</span>;</pre> - <dl> - <div> - <div> - </div> - </div> - </dl> - </div> - </div> - - <!-- MIN_VERSION --> - <p> - This function was added in version <b><span></span></b>. - If you require this function, the manifest key - <a href="manifest.html#minimum_chrome_version">minimum_chrome_version</a> - can ensure that your extension won't be run in an earlier browser version. - </p> - </div> <!-- /description --> - </div><div class="apiItem"> <a name="method-getURL"></a> <!-- method-anchor --> <h4>getURL</h4> diff --git a/chrome/common/extensions/docs/samples.json b/chrome/common/extensions/docs/samples.json index d9eb155..339e55d 100644 --- a/chrome/common/extensions/docs/samples.json +++ b/chrome/common/extensions/docs/samples.json @@ -94,7 +94,6 @@ "chrome.extension.connect": "extension.html#method-connect", "chrome.extension.getBackgroundPage": "extension.html#method-getBackgroundPage", "chrome.extension.getExtensionTabs": "extension.html#method-getExtensionTabs", - "chrome.extension.getToolstrips": "extension.html#method-getToolstrips", "chrome.extension.getURL": "extension.html#method-getURL", "chrome.extension.getViews": "extension.html#method-getViews", "chrome.extension.isAllowedFileSchemeAccess": "extension.html#method-isAllowedFileSchemeAccess", diff --git a/chrome/common/extensions/docs/server/chromeextensionsdocs.py b/chrome/common/extensions/docs/server/chromeextensionsdocs.py index 71e2f25..a15de08 100644 --- a/chrome/common/extensions/docs/server/chromeextensionsdocs.py +++ b/chrome/common/extensions/docs/server/chromeextensionsdocs.py @@ -1,5 +1,5 @@ #!/usr/bin/python -# Copyright (c) 2010 The Chromium Authors. All rights reserved. +# Copyright (c) 2011 The Chromium Authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. @@ -189,25 +189,21 @@ class MainPage(webapp.RequestHandler): self.check("/trunk/", "http://src.chromium.org/viewvc/chrome/trunk/src/chrome/common/extensions/docs/index.html", Channel.TRUNK) self.check("/trunk/index.html", "http://src.chromium.org/viewvc/chrome/trunk/src/chrome/common/extensions/docs/index.html", Channel.TRUNK) self.check("/trunk/getstarted.html", "http://src.chromium.org/viewvc/chrome/trunk/src/chrome/common/extensions/docs/getstarted.html", Channel.TRUNK) - self.check("/trunk/images/toolstrip.png", "http://src.chromium.org/viewvc/chrome/trunk/src/chrome/common/extensions/docs/images/toolstrip.png", Channel.TRUNK) self.response.out.write("<br/>Testing DEV<br/>") self.check("/dev/", "http://src.chromium.org/viewvc/chrome/branches/%s/src/chrome/common/extensions/docs/index.html", Channel.DEV) self.check("/dev/index.html", "http://src.chromium.org/viewvc/chrome/branches/%s/src/chrome/common/extensions/docs/index.html", Channel.DEV) self.check("/dev/getstarted.html", "http://src.chromium.org/viewvc/chrome/branches/%s/src/chrome/common/extensions/docs/getstarted.html", Channel.DEV) - self.check("/dev/images/toolstrip.png", "http://src.chromium.org/viewvc/chrome/branches/%s/src/chrome/common/extensions/docs/images/toolstrip.png", Channel.DEV) self.response.out.write("<br/>Testing BETA<br/>") self.check("/beta/", "http://src.chromium.org/viewvc/chrome/branches/%s/src/chrome/common/extensions/docs/index.html", Channel.BETA) self.check("/beta/index.html", "http://src.chromium.org/viewvc/chrome/branches/%s/src/chrome/common/extensions/docs/index.html", Channel.BETA) self.check("/beta/getstarted.html", "http://src.chromium.org/viewvc/chrome/branches/%s/src/chrome/common/extensions/docs/getstarted.html", Channel.BETA) - self.check("/beta/images/toolstrip.png", "http://src.chromium.org/viewvc/chrome/branches/%s/src/chrome/common/extensions/docs/images/toolstrip.png", Channel.BETA) self.response.out.write("<br/>Testing STABLE<br/>") self.check("/stable/", "http://src.chromium.org/viewvc/chrome/branches/%s/src/chrome/common/extensions/docs/index.html", Channel.STABLE) self.check("/stable/index.html", "http://src.chromium.org/viewvc/chrome/branches/%s/src/chrome/common/extensions/docs/index.html", Channel.STABLE) self.check("/stable/getstarted.html", "http://src.chromium.org/viewvc/chrome/branches/%s/src/chrome/common/extensions/docs/getstarted.html", Channel.STABLE) - self.check("/stable/images/toolstrip.png", "http://src.chromium.org/viewvc/chrome/branches/%s/src/chrome/common/extensions/docs/images/toolstrip.png", Channel.STABLE) self.response.out.write("<br/>Testing jstemplate_compiled.js<br/>") self.check("/trunk/third_party/jstemplate/jstemplate_compiled.js", "http://src.chromium.org/viewvc/chrome/trunk/src/chrome/third_party/jstemplate/jstemplate_compiled.js", Channel.TRUNK) @@ -233,7 +229,6 @@ class MainPage(webapp.RequestHandler): self.check("/", "http://src.chromium.org/viewvc/chrome/branches/%s/src/chrome/common/extensions/docs/index.html", Channel.DEV) self.check("/index.html", "http://src.chromium.org/viewvc/chrome/branches/%s/src/chrome/common/extensions/docs/index.html", Channel.DEV) self.check("/getstarted.html", "http://src.chromium.org/viewvc/chrome/branches/%s/src/chrome/common/extensions/docs/getstarted.html", Channel.DEV) - self.check("/images/toolstrip.png", "http://src.chromium.org/viewvc/chrome/branches/%s/src/chrome/common/extensions/docs/images/toolstrip.png", Channel.DEV) self.check("/third_party/jstemplate/jstemplate_compiled.js", "http://src.chromium.org/viewvc/chrome/branches/%s/src/chrome/third_party/jstemplate/jstemplate_compiled.js", Channel.DEV) self.check("/api/extension_api.json", "http://src.chromium.org/viewvc/chrome/branches/%s/src/chrome/common/extensions/api/extension_api.json", Channel.DEV) self.check("/css/ApiRefStyles.css", "http://src.chromium.org/viewvc/chrome/branches/%s/src/chrome/common/extensions/docs/css/ApiRefStyles.css", Channel.DEV) @@ -244,7 +239,6 @@ class MainPage(webapp.RequestHandler): self.check("/", "http://src.chromium.org/viewvc/chrome/trunk/src/chrome/common/extensions/docs/index.html", Channel.TRUNK) self.check("/index.html", "http://src.chromium.org/viewvc/chrome/trunk/src/chrome/common/extensions/docs/index.html", Channel.TRUNK) self.check("/getstarted.html", "http://src.chromium.org/viewvc/chrome/trunk/src/chrome/common/extensions/docs/getstarted.html", Channel.TRUNK) - self.check("/images/toolstrip.png", "http://src.chromium.org/viewvc/chrome/trunk/src/chrome/common/extensions/docs/images/toolstrip.png", Channel.TRUNK) self.check("/third_party/jstemplate/jstemplate_compiled.js", "http://src.chromium.org/viewvc/chrome/trunk/src/chrome/third_party/jstemplate/jstemplate_compiled.js", Channel.TRUNK) self.check("/api/extension_api.json", "http://src.chromium.org/viewvc/chrome/trunk/src/chrome/common/extensions/api/extension_api.json", Channel.TRUNK) self.check("/css/ApiRefStyles.css", "http://src.chromium.org/viewvc/chrome/trunk/src/chrome/common/extensions/docs/css/ApiRefStyles.css", Channel.TRUNK) diff --git a/chrome/common/extensions/extension.cc b/chrome/common/extensions/extension.cc index 0ad83a1f..00b4d40 100644 --- a/chrome/common/extensions/extension.cc +++ b/chrome/common/extensions/extension.cc @@ -1802,41 +1802,6 @@ bool Extension::InitFromValue(const DictionaryValue& source, int flags, } } - // Initialize toolstrips. - // TODO(aa): Remove this and all the related tests, docs, etc. - // See: crbug.com/100488. - if (api_permissions.count(ExtensionAPIPermission::kExperimental) && - source.HasKey(keys::kToolstrips)) { - ListValue* list_value = NULL; - if (!source.GetList(keys::kToolstrips, &list_value)) { - *error = errors::kInvalidToolstrips; - return false; - } - - for (size_t i = 0; i < list_value->GetSize(); ++i) { - GURL toolstrip; - DictionaryValue* toolstrip_value = NULL; - std::string toolstrip_path; - if (list_value->GetString(i, &toolstrip_path)) { - // Support a simple URL value for backwards compatibility. - toolstrip = GetResourceURL(toolstrip_path); - } else if (list_value->GetDictionary(i, &toolstrip_value)) { - if (!toolstrip_value->GetString(keys::kToolstripPath, - &toolstrip_path)) { - *error = ExtensionErrorUtils::FormatErrorMessage( - errors::kInvalidToolstrip, base::IntToString(i)); - return false; - } - toolstrip = GetResourceURL(toolstrip_path); - } else { - *error = ExtensionErrorUtils::FormatErrorMessage( - errors::kInvalidToolstrip, base::IntToString(i)); - return false; - } - toolstrips_.push_back(toolstrip); - } - } - // Initialize content scripts (optional). if (source.HasKey(keys::kContentScripts)) { ListValue* list_value; diff --git a/chrome/common/extensions/extension.h b/chrome/common/extensions/extension.h index a97f858..79af4f0 100644 --- a/chrome/common/extensions/extension.h +++ b/chrome/common/extensions/extension.h @@ -528,7 +528,6 @@ class Extension : public base::RefCountedThreadSafe<Extension> { const GURL& background_url() const { return background_url_; } const GURL& options_url() const { return options_url_; } const GURL& devtools_url() const { return devtools_url_; } - const std::vector<GURL>& toolstrips() const { return toolstrips_; } const ExtensionPermissionSet* optional_permission_set() const { return optional_permission_set_.get(); } @@ -786,9 +785,6 @@ class Extension : public base::RefCountedThreadSafe<Extension> { // Optional URL to a devtools extension page. GURL devtools_url_; - // Optional list of toolstrips and associated properties. - std::vector<GURL> toolstrips_; - // The public key used to sign the contents of the crx package. std::string public_key_; diff --git a/chrome/common/extensions/extension_constants.cc b/chrome/common/extensions/extension_constants.cc index 1bb0833..220afb38 100644 --- a/chrome/common/extensions/extension_constants.cc +++ b/chrome/common/extensions/extension_constants.cc @@ -94,8 +94,6 @@ const char* kThemeColors = "colors"; const char* kThemeDisplayProperties = "properties"; const char* kThemeImages = "images"; const char* kThemeTints = "tints"; -const char* kToolstripPath = "path"; -const char* kToolstrips = "toolstrips"; const char* kTtsEngine = "tts_engine"; const char* kTtsGenderFemale = "female"; const char* kTtsGenderMale = "male"; @@ -362,10 +360,6 @@ const char* kInvalidThemeImagesMissing = "An image specified in the theme is missing."; const char* kInvalidThemeTints = "Invalid value for theme images - tints must be decimal numbers."; -const char* kInvalidToolstrip = - "Invalid value for 'toolstrips[*]'"; -const char* kInvalidToolstrips = - "Invalid value for 'toolstrips'."; const char* kInvalidTts = "Invalid value for 'tts_engine'."; const char* kInvalidTtsVoices = diff --git a/chrome/common/extensions/extension_constants.h b/chrome/common/extensions/extension_constants.h index 7152ae4..4adc43c 100644 --- a/chrome/common/extensions/extension_constants.h +++ b/chrome/common/extensions/extension_constants.h @@ -95,8 +95,6 @@ namespace extension_manifest_keys { extern const char* kThemeDisplayProperties; extern const char* kThemeImages; extern const char* kThemeTints; - extern const char* kToolstripPath; - extern const char* kToolstrips; extern const char* kTtsEngine; extern const char* kTtsGenderFemale; extern const char* kTtsGenderMale; @@ -247,8 +245,6 @@ namespace extension_manifest_errors { extern const char* kInvalidThemeImages; extern const char* kInvalidThemeImagesMissing; extern const char* kInvalidThemeTints; - extern const char* kInvalidToolstrip; - extern const char* kInvalidToolstrips; extern const char* kInvalidTts; extern const char* kInvalidTtsVoices; extern const char* kInvalidTtsVoicesEventTypes; diff --git a/chrome/renderer/resources/extensions/extension_process_bindings.js b/chrome/renderer/resources/extensions/extension_process_bindings.js index 0d4745d..adcc188 100644 --- a/chrome/renderer/resources/extensions/extension_process_bindings.js +++ b/chrome/renderer/resources/extensions/extension_process_bindings.js @@ -412,14 +412,6 @@ var chrome = chrome || {}; } } - function setupToolstripEvents(renderViewId) { - chrome.toolstrip = chrome.toolstrip || {}; - chrome.toolstrip.onExpanded = - new chrome.Event("toolstrip.onExpanded." + renderViewId); - chrome.toolstrip.onCollapsed = - new chrome.Event("toolstrip.onCollapsed." + renderViewId); - } - function setupHiddenContextMenuEvent(extensionId) { chromeHidden.contextMenus = {}; chromeHidden.contextMenus.handlers = {}; @@ -792,13 +784,6 @@ var chrome = chrome || {}; return GetExtensionViews(-1, "BACKGROUND")[0] || null; }; - apiFunctions["extension.getToolstrips"].handleRequest = - function(windowId) { - if (typeof(windowId) == "undefined") - windowId = -1; - return GetExtensionViews(windowId, "TOOLSTRIP"); - }; - apiFunctions["extension.getExtensionTabs"].handleRequest = function(windowId) { if (typeof(windowId) == "undefined") @@ -1020,7 +1005,6 @@ var chrome = chrome || {}; } setupPageActionEvents(extensionId); - setupToolstripEvents(GetRenderViewId()); setupHiddenContextMenuEvent(extensionId); setupInputEvents(); setupOmniboxEvents(); diff --git a/chrome/renderer/resources/extensions/renderer_process_bindings.js b/chrome/renderer/resources/extensions/renderer_process_bindings.js index 58d7678..87f3d29 100644 --- a/chrome/renderer/resources/extensions/renderer_process_bindings.js +++ b/chrome/renderer/resources/extensions/renderer_process_bindings.js @@ -4,7 +4,7 @@ // This script contains unprivileged javascript APIs related to chrome // extensions. It is loaded by any extension-related context, such as content -// scripts or toolstrips. +// scripts or background pages. // See user_script_slave.cc for script that is loaded by content scripts only. // TODO(mpcomplete): we also load this in regular web pages, but don't need to. @@ -358,7 +358,6 @@ var chrome = chrome || {}; "proxy", "tabs", "test", - "toolstrip", "tts", "ttsEngine", "types", @@ -370,7 +369,6 @@ var chrome = chrome || {}; // Functions/events/properties within the extension namespace. "extension.getBackgroundPage", "extension.getExtensionTabs", - "extension.getToolstrips", "extension.getViews", "extension.isAllowedIncognitoAccess", "extension.isAllowedFileSchemeAccess", diff --git a/chrome/test/data/extensions/common/background_page/background.html b/chrome/test/data/extensions/common/background_page/background.html index e2a5d5a..684be0d 100644 --- a/chrome/test/data/extensions/common/background_page/background.html +++ b/chrome/test/data/extensions/common/background_page/background.html @@ -1,2 +1 @@ -<div class="toolstrip-button">Hello World!</div> - +<div>Hello World!</div> |