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

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

Issue 12313115: Take notification API out of experimental. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix merge conflict. Created 7 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
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 780 matching lines...) Expand 10 before | Expand all | Expand 10 after
791 IDR_DECLARATIVE_CONTENT_CUSTOM_BINDINGS_JS); 791 IDR_DECLARATIVE_CONTENT_CUSTOM_BINDINGS_JS);
792 source_map_.RegisterSource("declarativeWebRequest", 792 source_map_.RegisterSource("declarativeWebRequest",
793 IDR_DECLARATIVE_WEBREQUEST_CUSTOM_BINDINGS_JS); 793 IDR_DECLARATIVE_WEBREQUEST_CUSTOM_BINDINGS_JS);
794 source_map_.RegisterSource("downloads", 794 source_map_.RegisterSource("downloads",
795 IDR_DOWNLOADS_CUSTOM_BINDINGS_JS); 795 IDR_DOWNLOADS_CUSTOM_BINDINGS_JS);
796 source_map_.RegisterSource( 796 source_map_.RegisterSource(
797 "experimental.mediaGalleries", 797 "experimental.mediaGalleries",
798 IDR_EXPERIMENTAL_MEDIA_GALLERIES_CUSTOM_BINDINGS_JS); 798 IDR_EXPERIMENTAL_MEDIA_GALLERIES_CUSTOM_BINDINGS_JS);
799 source_map_.RegisterSource("experimental.offscreen", 799 source_map_.RegisterSource("experimental.offscreen",
800 IDR_EXPERIMENTAL_OFFSCREENTABS_CUSTOM_BINDINGS_JS); 800 IDR_EXPERIMENTAL_OFFSCREENTABS_CUSTOM_BINDINGS_JS);
801 source_map_.RegisterSource("experimental.notification",
802 IDR_NOTIFICATION_CUSTOM_BINDINGS_JS);
803 source_map_.RegisterSource("extension", IDR_EXTENSION_CUSTOM_BINDINGS_JS); 801 source_map_.RegisterSource("extension", IDR_EXTENSION_CUSTOM_BINDINGS_JS);
804 source_map_.RegisterSource("fileBrowserHandler", 802 source_map_.RegisterSource("fileBrowserHandler",
805 IDR_FILE_BROWSER_HANDLER_CUSTOM_BINDINGS_JS); 803 IDR_FILE_BROWSER_HANDLER_CUSTOM_BINDINGS_JS);
806 source_map_.RegisterSource("fileBrowserPrivate", 804 source_map_.RegisterSource("fileBrowserPrivate",
807 IDR_FILE_BROWSER_PRIVATE_CUSTOM_BINDINGS_JS); 805 IDR_FILE_BROWSER_PRIVATE_CUSTOM_BINDINGS_JS);
808 source_map_.RegisterSource("fileSystem", 806 source_map_.RegisterSource("fileSystem",
809 IDR_FILE_SYSTEM_CUSTOM_BINDINGS_JS); 807 IDR_FILE_SYSTEM_CUSTOM_BINDINGS_JS);
810 source_map_.RegisterSource("i18n", IDR_I18N_CUSTOM_BINDINGS_JS); 808 source_map_.RegisterSource("i18n", IDR_I18N_CUSTOM_BINDINGS_JS);
811 source_map_.RegisterSource("input.ime", IDR_INPUT_IME_CUSTOM_BINDINGS_JS); 809 source_map_.RegisterSource("input.ime", IDR_INPUT_IME_CUSTOM_BINDINGS_JS);
812 source_map_.RegisterSource("mediaGalleries", 810 source_map_.RegisterSource("mediaGalleries",
813 IDR_MEDIA_GALLERIES_CUSTOM_BINDINGS_JS); 811 IDR_MEDIA_GALLERIES_CUSTOM_BINDINGS_JS);
812 source_map_.RegisterSource("notifications",
813 IDR_NOTIFICATIONS_CUSTOM_BINDINGS_JS);
814 source_map_.RegisterSource("omnibox", IDR_OMNIBOX_CUSTOM_BINDINGS_JS); 814 source_map_.RegisterSource("omnibox", IDR_OMNIBOX_CUSTOM_BINDINGS_JS);
815 source_map_.RegisterSource("pageActions", 815 source_map_.RegisterSource("pageActions",
816 IDR_PAGE_ACTIONS_CUSTOM_BINDINGS_JS); 816 IDR_PAGE_ACTIONS_CUSTOM_BINDINGS_JS);
817 source_map_.RegisterSource("pageAction", IDR_PAGE_ACTION_CUSTOM_BINDINGS_JS); 817 source_map_.RegisterSource("pageAction", IDR_PAGE_ACTION_CUSTOM_BINDINGS_JS);
818 source_map_.RegisterSource("pageCapture", 818 source_map_.RegisterSource("pageCapture",
819 IDR_PAGE_CAPTURE_CUSTOM_BINDINGS_JS); 819 IDR_PAGE_CAPTURE_CUSTOM_BINDINGS_JS);
820 source_map_.RegisterSource("permissions", IDR_PERMISSIONS_CUSTOM_BINDINGS_JS); 820 source_map_.RegisterSource("permissions", IDR_PERMISSIONS_CUSTOM_BINDINGS_JS);
821 source_map_.RegisterSource("runtime", IDR_RUNTIME_CUSTOM_BINDINGS_JS); 821 source_map_.RegisterSource("runtime", IDR_RUNTIME_CUSTOM_BINDINGS_JS);
822 source_map_.RegisterSource("storage", IDR_STORAGE_CUSTOM_BINDINGS_JS); 822 source_map_.RegisterSource("storage", IDR_STORAGE_CUSTOM_BINDINGS_JS);
823 source_map_.RegisterSource("syncFileSystem", 823 source_map_.RegisterSource("syncFileSystem",
(...skipping 483 matching lines...) Expand 10 before | Expand all | Expand 10 after
1307 std::string error_msg = base::StringPrintf(kMessage, function_name.c_str()); 1307 std::string error_msg = base::StringPrintf(kMessage, function_name.c_str());
1308 v8::ThrowException( 1308 v8::ThrowException(
1309 v8::Exception::Error(v8::String::New(error_msg.c_str()))); 1309 v8::Exception::Error(v8::String::New(error_msg.c_str())));
1310 return false; 1310 return false;
1311 } 1311 }
1312 1312
1313 return true; 1313 return true;
1314 } 1314 }
1315 1315
1316 } // namespace extensions 1316 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698