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

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

Issue 10916019: Move MediaGalleries.getMediaFileSystems out of experimental. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Update docs Created 8 years, 3 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
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/dispatcher.h" 5 #include "chrome/renderer/extensions/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 16 matching lines...) Expand all
27 #include "chrome/renderer/extensions/context_menus_custom_bindings.h" 27 #include "chrome/renderer/extensions/context_menus_custom_bindings.h"
28 #include "chrome/renderer/extensions/event_bindings.h" 28 #include "chrome/renderer/extensions/event_bindings.h"
29 #include "chrome/renderer/extensions/experimental.usb_custom_bindings.h" 29 #include "chrome/renderer/extensions/experimental.usb_custom_bindings.h"
30 #include "chrome/renderer/extensions/extension_custom_bindings.h" 30 #include "chrome/renderer/extensions/extension_custom_bindings.h"
31 #include "chrome/renderer/extensions/extension_groups.h" 31 #include "chrome/renderer/extensions/extension_groups.h"
32 #include "chrome/renderer/extensions/extension_helper.h" 32 #include "chrome/renderer/extensions/extension_helper.h"
33 #include "chrome/renderer/extensions/file_browser_handler_custom_bindings.h" 33 #include "chrome/renderer/extensions/file_browser_handler_custom_bindings.h"
34 #include "chrome/renderer/extensions/file_browser_private_custom_bindings.h" 34 #include "chrome/renderer/extensions/file_browser_private_custom_bindings.h"
35 #include "chrome/renderer/extensions/file_system_natives.h" 35 #include "chrome/renderer/extensions/file_system_natives.h"
36 #include "chrome/renderer/extensions/i18n_custom_bindings.h" 36 #include "chrome/renderer/extensions/i18n_custom_bindings.h"
37 #include "chrome/renderer/extensions/media_gallery_custom_bindings.h" 37 #include "chrome/renderer/extensions/media_galleries_custom_bindings.h"
38 #include "chrome/renderer/extensions/miscellaneous_bindings.h" 38 #include "chrome/renderer/extensions/miscellaneous_bindings.h"
39 #include "chrome/renderer/extensions/module_system.h" 39 #include "chrome/renderer/extensions/module_system.h"
40 #include "chrome/renderer/extensions/native_handler.h" 40 #include "chrome/renderer/extensions/native_handler.h"
41 #include "chrome/renderer/extensions/page_actions_custom_bindings.h" 41 #include "chrome/renderer/extensions/page_actions_custom_bindings.h"
42 #include "chrome/renderer/extensions/page_capture_custom_bindings.h" 42 #include "chrome/renderer/extensions/page_capture_custom_bindings.h"
43 #include "chrome/renderer/extensions/request_sender.h" 43 #include "chrome/renderer/extensions/request_sender.h"
44 #include "chrome/renderer/extensions/runtime_custom_bindings.h" 44 #include "chrome/renderer/extensions/runtime_custom_bindings.h"
45 #include "chrome/renderer/extensions/send_request_natives.h" 45 #include "chrome/renderer/extensions/send_request_natives.h"
46 #include "chrome/renderer/extensions/set_icon_natives.h" 46 #include "chrome/renderer/extensions/set_icon_natives.h"
47 #include "chrome/renderer/extensions/tab_finder.h" 47 #include "chrome/renderer/extensions/tab_finder.h"
(...skipping 520 matching lines...) Expand 10 before | Expand all | Expand 10 after
568 scoped_ptr<NativeHandler>(new AppBindings(this, context))); 568 scoped_ptr<NativeHandler>(new AppBindings(this, context)));
569 module_system->RegisterNativeHandler("app_runtime", 569 module_system->RegisterNativeHandler("app_runtime",
570 scoped_ptr<NativeHandler>(new AppRuntimeCustomBindings())); 570 scoped_ptr<NativeHandler>(new AppRuntimeCustomBindings()));
571 module_system->RegisterNativeHandler("app_window", 571 module_system->RegisterNativeHandler("app_window",
572 scoped_ptr<NativeHandler>(new AppWindowCustomBindings(this))); 572 scoped_ptr<NativeHandler>(new AppWindowCustomBindings(this)));
573 module_system->RegisterNativeHandler("context_menus", 573 module_system->RegisterNativeHandler("context_menus",
574 scoped_ptr<NativeHandler>(new ContextMenusCustomBindings())); 574 scoped_ptr<NativeHandler>(new ContextMenusCustomBindings()));
575 module_system->RegisterNativeHandler("extension", 575 module_system->RegisterNativeHandler("extension",
576 scoped_ptr<NativeHandler>( 576 scoped_ptr<NativeHandler>(
577 new ExtensionCustomBindings(this))); 577 new ExtensionCustomBindings(this)));
578 module_system->RegisterNativeHandler("experimental_mediaGalleries",
579 scoped_ptr<NativeHandler>(new MediaGalleryCustomBindings()));
580 module_system->RegisterNativeHandler("experimental_usb", 578 module_system->RegisterNativeHandler("experimental_usb",
581 scoped_ptr<NativeHandler>(new ExperimentalUsbCustomBindings())); 579 scoped_ptr<NativeHandler>(new ExperimentalUsbCustomBindings()));
582 module_system->RegisterNativeHandler("file_browser_handler", 580 module_system->RegisterNativeHandler("file_browser_handler",
583 scoped_ptr<NativeHandler>(new FileBrowserHandlerCustomBindings())); 581 scoped_ptr<NativeHandler>(new FileBrowserHandlerCustomBindings()));
584 module_system->RegisterNativeHandler("file_browser_private", 582 module_system->RegisterNativeHandler("file_browser_private",
585 scoped_ptr<NativeHandler>(new FileBrowserPrivateCustomBindings())); 583 scoped_ptr<NativeHandler>(new FileBrowserPrivateCustomBindings()));
586 module_system->RegisterNativeHandler("i18n", 584 module_system->RegisterNativeHandler("i18n",
587 scoped_ptr<NativeHandler>(new I18NCustomBindings())); 585 scoped_ptr<NativeHandler>(new I18NCustomBindings()));
586 module_system->RegisterNativeHandler("mediaGalleries",
587 scoped_ptr<NativeHandler>(new MediaGalleriesCustomBindings()));
588 module_system->RegisterNativeHandler("page_actions", 588 module_system->RegisterNativeHandler("page_actions",
589 scoped_ptr<NativeHandler>( 589 scoped_ptr<NativeHandler>(
590 new PageActionsCustomBindings(this))); 590 new PageActionsCustomBindings(this)));
591 module_system->RegisterNativeHandler("page_capture", 591 module_system->RegisterNativeHandler("page_capture",
592 scoped_ptr<NativeHandler>(new PageCaptureCustomBindings())); 592 scoped_ptr<NativeHandler>(new PageCaptureCustomBindings()));
593 module_system->RegisterNativeHandler("runtime", 593 module_system->RegisterNativeHandler("runtime",
594 scoped_ptr<NativeHandler>(new RuntimeCustomBindings(context))); 594 scoped_ptr<NativeHandler>(new RuntimeCustomBindings(context)));
595 module_system->RegisterNativeHandler("tabs", 595 module_system->RegisterNativeHandler("tabs",
596 scoped_ptr<NativeHandler>(new TabsCustomBindings())); 596 scoped_ptr<NativeHandler>(new TabsCustomBindings()));
597 module_system->RegisterNativeHandler("tts", 597 module_system->RegisterNativeHandler("tts",
(...skipping 28 matching lines...) Expand all
626 IDR_BROWSER_ACTION_CUSTOM_BINDINGS_JS); 626 IDR_BROWSER_ACTION_CUSTOM_BINDINGS_JS);
627 source_map_.RegisterSource("contentSettings", 627 source_map_.RegisterSource("contentSettings",
628 IDR_CONTENT_SETTINGS_CUSTOM_BINDINGS_JS); 628 IDR_CONTENT_SETTINGS_CUSTOM_BINDINGS_JS);
629 source_map_.RegisterSource("contextMenus", 629 source_map_.RegisterSource("contextMenus",
630 IDR_CONTEXT_MENUS_CUSTOM_BINDINGS_JS); 630 IDR_CONTEXT_MENUS_CUSTOM_BINDINGS_JS);
631 source_map_.RegisterSource("declarativeWebRequest", 631 source_map_.RegisterSource("declarativeWebRequest",
632 IDR_DECLARATIVE_WEBREQUEST_CUSTOM_BINDINGS_JS); 632 IDR_DECLARATIVE_WEBREQUEST_CUSTOM_BINDINGS_JS);
633 source_map_.RegisterSource("devtools", IDR_DEVTOOLS_CUSTOM_BINDINGS_JS); 633 source_map_.RegisterSource("devtools", IDR_DEVTOOLS_CUSTOM_BINDINGS_JS);
634 source_map_.RegisterSource("experimental.bluetooth", 634 source_map_.RegisterSource("experimental.bluetooth",
635 IDR_EXPERIMENTAL_BLUETOOTH_CUSTOM_BINDINGS_JS); 635 IDR_EXPERIMENTAL_BLUETOOTH_CUSTOM_BINDINGS_JS);
636 source_map_.RegisterSource("experimental.mediaGalleries", 636 source_map_.RegisterSource(
637 IDR_EXPERIMENTAL_MEDIA_GALLERY_CUSTOM_BINDINGS_JS); 637 "experimental.mediaGalleries",
638 IDR_EXPERIMENTAL_MEDIA_GALLERIES_CUSTOM_BINDINGS_JS);
638 source_map_.RegisterSource("experimental.offscreen", 639 source_map_.RegisterSource("experimental.offscreen",
639 IDR_EXPERIMENTAL_OFFSCREENTABS_CUSTOM_BINDINGS_JS); 640 IDR_EXPERIMENTAL_OFFSCREENTABS_CUSTOM_BINDINGS_JS);
640 source_map_.RegisterSource("experimental.usb", 641 source_map_.RegisterSource("experimental.usb",
641 IDR_EXPERIMENTAL_USB_CUSTOM_BINDINGS_JS); 642 IDR_EXPERIMENTAL_USB_CUSTOM_BINDINGS_JS);
642 source_map_.RegisterSource("extension", IDR_EXTENSION_CUSTOM_BINDINGS_JS); 643 source_map_.RegisterSource("extension", IDR_EXTENSION_CUSTOM_BINDINGS_JS);
643 source_map_.RegisterSource("fileBrowserHandler", 644 source_map_.RegisterSource("fileBrowserHandler",
644 IDR_FILE_BROWSER_HANDLER_CUSTOM_BINDINGS_JS); 645 IDR_FILE_BROWSER_HANDLER_CUSTOM_BINDINGS_JS);
645 source_map_.RegisterSource("fileBrowserPrivate", 646 source_map_.RegisterSource("fileBrowserPrivate",
646 IDR_FILE_BROWSER_PRIVATE_CUSTOM_BINDINGS_JS); 647 IDR_FILE_BROWSER_PRIVATE_CUSTOM_BINDINGS_JS);
647 source_map_.RegisterSource("fileSystem", 648 source_map_.RegisterSource("fileSystem",
648 IDR_FILE_SYSTEM_CUSTOM_BINDINGS_JS); 649 IDR_FILE_SYSTEM_CUSTOM_BINDINGS_JS);
649 source_map_.RegisterSource("i18n", IDR_I18N_CUSTOM_BINDINGS_JS); 650 source_map_.RegisterSource("i18n", IDR_I18N_CUSTOM_BINDINGS_JS);
650 source_map_.RegisterSource("input.ime", IDR_INPUT_IME_CUSTOM_BINDINGS_JS); 651 source_map_.RegisterSource("input.ime", IDR_INPUT_IME_CUSTOM_BINDINGS_JS);
652 source_map_.RegisterSource("mediaGalleries",
653 IDR_MEDIA_GALLERIES_CUSTOM_BINDINGS_JS);
651 source_map_.RegisterSource("omnibox", IDR_OMNIBOX_CUSTOM_BINDINGS_JS); 654 source_map_.RegisterSource("omnibox", IDR_OMNIBOX_CUSTOM_BINDINGS_JS);
652 source_map_.RegisterSource("pageActions", 655 source_map_.RegisterSource("pageActions",
653 IDR_PAGE_ACTIONS_CUSTOM_BINDINGS_JS); 656 IDR_PAGE_ACTIONS_CUSTOM_BINDINGS_JS);
654 source_map_.RegisterSource("pageAction", IDR_PAGE_ACTION_CUSTOM_BINDINGS_JS); 657 source_map_.RegisterSource("pageAction", IDR_PAGE_ACTION_CUSTOM_BINDINGS_JS);
655 source_map_.RegisterSource("pageCapture", 658 source_map_.RegisterSource("pageCapture",
656 IDR_PAGE_CAPTURE_CUSTOM_BINDINGS_JS); 659 IDR_PAGE_CAPTURE_CUSTOM_BINDINGS_JS);
657 source_map_.RegisterSource("runtime", IDR_RUNTIME_CUSTOM_BINDINGS_JS); 660 source_map_.RegisterSource("runtime", IDR_RUNTIME_CUSTOM_BINDINGS_JS);
658 source_map_.RegisterSource("storage", IDR_STORAGE_CUSTOM_BINDINGS_JS); 661 source_map_.RegisterSource("storage", IDR_STORAGE_CUSTOM_BINDINGS_JS);
659 source_map_.RegisterSource("tabs", IDR_TABS_CUSTOM_BINDINGS_JS); 662 source_map_.RegisterSource("tabs", IDR_TABS_CUSTOM_BINDINGS_JS);
660 source_map_.RegisterSource("tts", IDR_TTS_CUSTOM_BINDINGS_JS); 663 source_map_.RegisterSource("tts", IDR_TTS_CUSTOM_BINDINGS_JS);
(...skipping 440 matching lines...) Expand 10 before | Expand all | Expand 10 after
1101 // we should abort. 1104 // we should abort.
1102 WebKit::WebFrame* frame = context->web_frame(); 1105 WebKit::WebFrame* frame = context->web_frame();
1103 ExtensionURLInfo url_info(frame->document().securityOrigin(), 1106 ExtensionURLInfo url_info(frame->document().securityOrigin(),
1104 UserScriptSlave::GetDataSourceURLForFrame(frame)); 1107 UserScriptSlave::GetDataSourceURLForFrame(frame));
1105 CHECK(!extensions_.IsSandboxedPage(url_info)); 1108 CHECK(!extensions_.IsSandboxedPage(url_info));
1106 1109
1107 return true; 1110 return true;
1108 } 1111 }
1109 1112
1110 } // namespace extensions 1113 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698