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

Side by Side Diff: chrome/renderer/extensions/extension_dispatcher.cc

Issue 9796012: Revert 127833 - Re-land alexbost's experimental offscreenTabs API. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 9 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/common/extensions/docs/samples.json ('k') | chrome/renderer/renderer_resources.grd » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Property Changes:
Added: svn:mergeinfo
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/renderer/extensions/extension_dispatcher.h" 5 #include "chrome/renderer/extensions/extension_dispatcher.h"
6 6
7 #include "base/callback.h" 7 #include "base/callback.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "base/string_piece.h" 10 #include "base/string_piece.h"
(...skipping 460 matching lines...) Expand 10 before | Expand all | Expand 10 after
471 IDR_BROWSER_ACTION_CUSTOM_BINDINGS_JS); 471 IDR_BROWSER_ACTION_CUSTOM_BINDINGS_JS);
472 source_map_.RegisterSource("chromePrivate", 472 source_map_.RegisterSource("chromePrivate",
473 IDR_CHROME_PRIVATE_CUSTOM_BINDINGS_JS); 473 IDR_CHROME_PRIVATE_CUSTOM_BINDINGS_JS);
474 source_map_.RegisterSource("contentSettings", 474 source_map_.RegisterSource("contentSettings",
475 IDR_CONTENT_SETTINGS_CUSTOM_BINDINGS_JS); 475 IDR_CONTENT_SETTINGS_CUSTOM_BINDINGS_JS);
476 source_map_.RegisterSource("contextMenus", 476 source_map_.RegisterSource("contextMenus",
477 IDR_CONTEXT_MENUS_CUSTOM_BINDINGS_JS); 477 IDR_CONTEXT_MENUS_CUSTOM_BINDINGS_JS);
478 source_map_.RegisterSource("devtools", IDR_DEVTOOLS_CUSTOM_BINDINGS_JS); 478 source_map_.RegisterSource("devtools", IDR_DEVTOOLS_CUSTOM_BINDINGS_JS);
479 source_map_.RegisterSource("experimental.declarative", 479 source_map_.RegisterSource("experimental.declarative",
480 IDR_EXPERIMENTAL_DECLARATIVE_CUSTOM_BINDINGS_JS); 480 IDR_EXPERIMENTAL_DECLARATIVE_CUSTOM_BINDINGS_JS);
481 source_map_.RegisterSource("experimental.offscreen",
482 IDR_EXPERIMENTAL_OFFSCREENTABS_CUSTOM_BINDINGS_JS);
483 source_map_.RegisterSource("experimental.socket", 481 source_map_.RegisterSource("experimental.socket",
484 IDR_EXPERIMENTAL_SOCKET_CUSTOM_BINDINGS_JS); 482 IDR_EXPERIMENTAL_SOCKET_CUSTOM_BINDINGS_JS);
485 source_map_.RegisterSource("extension", IDR_EXTENSION_CUSTOM_BINDINGS_JS); 483 source_map_.RegisterSource("extension", IDR_EXTENSION_CUSTOM_BINDINGS_JS);
486 source_map_.RegisterSource("fileBrowserHandler", 484 source_map_.RegisterSource("fileBrowserHandler",
487 IDR_FILE_BROWSER_HANDLER_CUSTOM_BINDINGS_JS); 485 IDR_FILE_BROWSER_HANDLER_CUSTOM_BINDINGS_JS);
488 source_map_.RegisterSource("fileBrowserPrivate", 486 source_map_.RegisterSource("fileBrowserPrivate",
489 IDR_FILE_BROWSER_PRIVATE_CUSTOM_BINDINGS_JS); 487 IDR_FILE_BROWSER_PRIVATE_CUSTOM_BINDINGS_JS);
490 source_map_.RegisterSource("i18n", IDR_I18N_CUSTOM_BINDINGS_JS); 488 source_map_.RegisterSource("i18n", IDR_I18N_CUSTOM_BINDINGS_JS);
491 source_map_.RegisterSource("input.ime", IDR_INPUT_IME_CUSTOM_BINDINGS_JS); 489 source_map_.RegisterSource("input.ime", IDR_INPUT_IME_CUSTOM_BINDINGS_JS);
492 source_map_.RegisterSource("omnibox", IDR_OMNIBOX_CUSTOM_BINDINGS_JS); 490 source_map_.RegisterSource("omnibox", IDR_OMNIBOX_CUSTOM_BINDINGS_JS);
(...skipping 236 matching lines...) Expand 10 before | Expand all | Expand 10 after
729 webrequest_adblock_ = adblock; 727 webrequest_adblock_ = adblock;
730 webrequest_adblock_plus_ = adblock_plus; 728 webrequest_adblock_plus_ = adblock_plus;
731 webrequest_other_ = other; 729 webrequest_other_ = other;
732 } 730 }
733 731
734 void ExtensionDispatcher::OnShouldClose(const std::string& extension_id, 732 void ExtensionDispatcher::OnShouldClose(const std::string& extension_id,
735 int sequence_id) { 733 int sequence_id) {
736 RenderThread::Get()->Send( 734 RenderThread::Get()->Send(
737 new ExtensionHostMsg_ShouldCloseAck(extension_id, sequence_id)); 735 new ExtensionHostMsg_ShouldCloseAck(extension_id, sequence_id));
738 } 736 }
OLDNEW
« no previous file with comments | « chrome/common/extensions/docs/samples.json ('k') | chrome/renderer/renderer_resources.grd » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698