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

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

Issue 835253002: Update mojo sdk to rev e3719475d5971283d1d2250533d53066b2ff9797 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 11 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
« no previous file with comments | « content/content_resources.grd ('k') | mojo/public/VERSION » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "extensions/renderer/dispatcher.h" 5 #include "extensions/renderer/dispatcher.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/callback.h" 8 #include "base/callback.h"
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/debug/alias.h" 10 #include "base/debug/alias.h"
(...skipping 550 matching lines...) Expand 10 before | Expand all | Expand 10 after
561 IDR_WEB_VIEW_ATTRIBUTES_JS)); 561 IDR_WEB_VIEW_ATTRIBUTES_JS));
562 resources.push_back(std::make_pair("webViewConstants", 562 resources.push_back(std::make_pair("webViewConstants",
563 IDR_WEB_VIEW_CONSTANTS_JS)); 563 IDR_WEB_VIEW_CONSTANTS_JS));
564 resources.push_back(std::make_pair("webViewEvents", IDR_WEB_VIEW_EVENTS_JS)); 564 resources.push_back(std::make_pair("webViewEvents", IDR_WEB_VIEW_EVENTS_JS));
565 resources.push_back( 565 resources.push_back(
566 std::make_pair("webViewExperimental", IDR_WEB_VIEW_EXPERIMENTAL_JS)); 566 std::make_pair("webViewExperimental", IDR_WEB_VIEW_EXPERIMENTAL_JS));
567 resources.push_back(std::make_pair("webViewInternal", 567 resources.push_back(std::make_pair("webViewInternal",
568 IDR_WEB_VIEW_INTERNAL_CUSTOM_BINDINGS_JS)); 568 IDR_WEB_VIEW_INTERNAL_CUSTOM_BINDINGS_JS));
569 resources.push_back(std::make_pair("denyWebView", IDR_WEB_VIEW_DENY_JS)); 569 resources.push_back(std::make_pair("denyWebView", IDR_WEB_VIEW_DENY_JS));
570 resources.push_back( 570 resources.push_back(
571 std::make_pair(mojo::kBindingsModuleName, IDR_MOJO_BINDINGS_JS));
572 resources.push_back(
571 std::make_pair(mojo::kBufferModuleName, IDR_MOJO_BUFFER_JS)); 573 std::make_pair(mojo::kBufferModuleName, IDR_MOJO_BUFFER_JS));
572 resources.push_back( 574 resources.push_back(
573 std::make_pair(mojo::kCodecModuleName, IDR_MOJO_CODEC_JS)); 575 std::make_pair(mojo::kCodecModuleName, IDR_MOJO_CODEC_JS));
574 resources.push_back( 576 resources.push_back(
575 std::make_pair(mojo::kConnectionModuleName, IDR_MOJO_CONNECTION_JS)); 577 std::make_pair(mojo::kConnectionModuleName, IDR_MOJO_CONNECTION_JS));
576 resources.push_back( 578 resources.push_back(
577 std::make_pair(mojo::kConnectorModuleName, IDR_MOJO_CONNECTOR_JS)); 579 std::make_pair(mojo::kConnectorModuleName, IDR_MOJO_CONNECTOR_JS));
578 resources.push_back( 580 resources.push_back(
579 std::make_pair(mojo::kRouterModuleName, IDR_MOJO_ROUTER_JS)); 581 std::make_pair(mojo::kRouterModuleName, IDR_MOJO_ROUTER_JS));
580 resources.push_back( 582 resources.push_back(
(...skipping 834 matching lines...) Expand 10 before | Expand all | Expand 10 after
1415 return v8::Handle<v8::Object>(); 1417 return v8::Handle<v8::Object>();
1416 1418
1417 if (bind_name) 1419 if (bind_name)
1418 *bind_name = split.back(); 1420 *bind_name = split.back();
1419 1421
1420 return bind_object.IsEmpty() ? AsObjectOrEmpty(GetOrCreateChrome(context)) 1422 return bind_object.IsEmpty() ? AsObjectOrEmpty(GetOrCreateChrome(context))
1421 : bind_object; 1423 : bind_object;
1422 } 1424 }
1423 1425
1424 } // namespace extensions 1426 } // namespace extensions
OLDNEW
« no previous file with comments | « content/content_resources.grd ('k') | mojo/public/VERSION » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698