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

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

Issue 18341016: Add types.private.ChromeDirectSetting and Connect it to preferencesPrivate.googleGeolocationAccessE… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Sync to Latest Created 7 years, 5 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
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/debug/alias.h" 9 #include "base/debug/alias.h"
10 #include "base/json/json_reader.h" 10 #include "base/json/json_reader.h"
(...skipping 935 matching lines...) Expand 10 before | Expand all | Expand 10 after
946 source_map_.RegisterSource("webRequestInternal", 946 source_map_.RegisterSource("webRequestInternal",
947 IDR_WEB_REQUEST_INTERNAL_CUSTOM_BINDINGS_JS); 947 IDR_WEB_REQUEST_INTERNAL_CUSTOM_BINDINGS_JS);
948 source_map_.RegisterSource("webstore", IDR_WEBSTORE_CUSTOM_BINDINGS_JS); 948 source_map_.RegisterSource("webstore", IDR_WEBSTORE_CUSTOM_BINDINGS_JS);
949 source_map_.RegisterSource("windowControls", IDR_WINDOW_CONTROLS_JS); 949 source_map_.RegisterSource("windowControls", IDR_WINDOW_CONTROLS_JS);
950 source_map_.RegisterSource("binding", IDR_BINDING_JS); 950 source_map_.RegisterSource("binding", IDR_BINDING_JS);
951 951
952 // Custom types sources. 952 // Custom types sources.
953 source_map_.RegisterSource("ChromeSetting", IDR_CHROME_SETTING_JS); 953 source_map_.RegisterSource("ChromeSetting", IDR_CHROME_SETTING_JS);
954 source_map_.RegisterSource("StorageArea", IDR_STORAGE_AREA_JS); 954 source_map_.RegisterSource("StorageArea", IDR_STORAGE_AREA_JS);
955 source_map_.RegisterSource("ContentSetting", IDR_CONTENT_SETTING_JS); 955 source_map_.RegisterSource("ContentSetting", IDR_CONTENT_SETTING_JS);
956 source_map_.RegisterSource("ChromeDirectSetting",
957 IDR_CHROME_DIRECT_SETTING_JS);
956 958
957 // Platform app sources that are not API-specific.. 959 // Platform app sources that are not API-specific..
958 source_map_.RegisterSource("tagWatcher", IDR_TAG_WATCHER_JS); 960 source_map_.RegisterSource("tagWatcher", IDR_TAG_WATCHER_JS);
959 // Note: webView not webview so that this doesn't interfere with the 961 // Note: webView not webview so that this doesn't interfere with the
960 // chrome.webview API bindings. 962 // chrome.webview API bindings.
961 source_map_.RegisterSource("webView", IDR_WEB_VIEW_JS); 963 source_map_.RegisterSource("webView", IDR_WEB_VIEW_JS);
962 source_map_.RegisterSource("webViewExperimental", 964 source_map_.RegisterSource("webViewExperimental",
963 IDR_WEB_VIEW_EXPERIMENTAL_JS); 965 IDR_WEB_VIEW_EXPERIMENTAL_JS);
964 source_map_.RegisterSource("denyWebView", IDR_WEB_VIEW_DENY_JS); 966 source_map_.RegisterSource("denyWebView", IDR_WEB_VIEW_DENY_JS);
965 source_map_.RegisterSource("adView", IDR_AD_VIEW_JS); 967 source_map_.RegisterSource("adView", IDR_AD_VIEW_JS);
(...skipping 529 matching lines...) Expand 10 before | Expand all | Expand 10 after
1495 RenderView* background_view = 1497 RenderView* background_view =
1496 ExtensionHelper::GetBackgroundPage(extension_id); 1498 ExtensionHelper::GetBackgroundPage(extension_id);
1497 if (background_view) { 1499 if (background_view) {
1498 background_view->Send(new ExtensionHostMsg_EventAck( 1500 background_view->Send(new ExtensionHostMsg_EventAck(
1499 background_view->GetRoutingID())); 1501 background_view->GetRoutingID()));
1500 } 1502 }
1501 } 1503 }
1502 } 1504 }
1503 1505
1504 } // namespace extensions 1506 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/common/extensions_api_resources.grd ('k') | chrome/renderer/resources/extensions/chrome_direct_setting.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698