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

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

Issue 1410053006: Move third_party/mojo/src/mojo/public to mojo/public (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge Created 5 years, 1 month 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 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/bind_helpers.h" 8 #include "base/bind_helpers.h"
9 #include "base/callback.h" 9 #include "base/callback.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
86 #include "extensions/renderer/static_v8_external_one_byte_string_resource.h" 86 #include "extensions/renderer/static_v8_external_one_byte_string_resource.h"
87 #include "extensions/renderer/test_features_native_handler.h" 87 #include "extensions/renderer/test_features_native_handler.h"
88 #include "extensions/renderer/test_native_handler.h" 88 #include "extensions/renderer/test_native_handler.h"
89 #include "extensions/renderer/user_gestures_native_handler.h" 89 #include "extensions/renderer/user_gestures_native_handler.h"
90 #include "extensions/renderer/utils_native_handler.h" 90 #include "extensions/renderer/utils_native_handler.h"
91 #include "extensions/renderer/v8_context_native_handler.h" 91 #include "extensions/renderer/v8_context_native_handler.h"
92 #include "extensions/renderer/v8_helpers.h" 92 #include "extensions/renderer/v8_helpers.h"
93 #include "extensions/renderer/wake_event_page.h" 93 #include "extensions/renderer/wake_event_page.h"
94 #include "extensions/renderer/worker_script_context_set.h" 94 #include "extensions/renderer/worker_script_context_set.h"
95 #include "grit/extensions_renderer_resources.h" 95 #include "grit/extensions_renderer_resources.h"
96 #include "mojo/public/js/constants.h"
96 #include "third_party/WebKit/public/platform/WebString.h" 97 #include "third_party/WebKit/public/platform/WebString.h"
97 #include "third_party/WebKit/public/platform/WebURLRequest.h" 98 #include "third_party/WebKit/public/platform/WebURLRequest.h"
98 #include "third_party/WebKit/public/web/WebCustomElement.h" 99 #include "third_party/WebKit/public/web/WebCustomElement.h"
99 #include "third_party/WebKit/public/web/WebDataSource.h" 100 #include "third_party/WebKit/public/web/WebDataSource.h"
100 #include "third_party/WebKit/public/web/WebDocument.h" 101 #include "third_party/WebKit/public/web/WebDocument.h"
101 #include "third_party/WebKit/public/web/WebFrame.h" 102 #include "third_party/WebKit/public/web/WebFrame.h"
102 #include "third_party/WebKit/public/web/WebLocalFrame.h" 103 #include "third_party/WebKit/public/web/WebLocalFrame.h"
103 #include "third_party/WebKit/public/web/WebRuntimeFeatures.h" 104 #include "third_party/WebKit/public/web/WebRuntimeFeatures.h"
104 #include "third_party/WebKit/public/web/WebScopedUserGesture.h" 105 #include "third_party/WebKit/public/web/WebScopedUserGesture.h"
105 #include "third_party/WebKit/public/web/WebSecurityPolicy.h" 106 #include "third_party/WebKit/public/web/WebSecurityPolicy.h"
106 #include "third_party/WebKit/public/web/WebView.h" 107 #include "third_party/WebKit/public/web/WebView.h"
107 #include "third_party/mojo/src/mojo/public/js/constants.h"
108 #include "ui/base/layout.h" 108 #include "ui/base/layout.h"
109 #include "ui/base/resource/resource_bundle.h" 109 #include "ui/base/resource/resource_bundle.h"
110 #include "v8/include/v8.h" 110 #include "v8/include/v8.h"
111 111
112 using base::UserMetricsAction; 112 using base::UserMetricsAction;
113 using blink::WebDataSource; 113 using blink::WebDataSource;
114 using blink::WebDocument; 114 using blink::WebDocument;
115 using blink::WebScopedUserGesture; 115 using blink::WebScopedUserGesture;
116 using blink::WebSecurityPolicy; 116 using blink::WebSecurityPolicy;
117 using blink::WebString; 117 using blink::WebString;
(...skipping 1475 matching lines...) Expand 10 before | Expand all | Expand 10 after
1593 // The "guestViewDeny" module must always be loaded last. It registers 1593 // The "guestViewDeny" module must always be loaded last. It registers
1594 // error-providing custom elements for the GuestView types that are not 1594 // error-providing custom elements for the GuestView types that are not
1595 // available, and thus all of those types must have been checked and loaded 1595 // available, and thus all of those types must have been checked and loaded
1596 // (or not loaded) beforehand. 1596 // (or not loaded) beforehand.
1597 if (context_type == Feature::BLESSED_EXTENSION_CONTEXT) { 1597 if (context_type == Feature::BLESSED_EXTENSION_CONTEXT) {
1598 module_system->Require("guestViewDeny"); 1598 module_system->Require("guestViewDeny");
1599 } 1599 }
1600 } 1600 }
1601 1601
1602 } // namespace extensions 1602 } // namespace extensions
OLDNEW
« no previous file with comments | « extensions/renderer/api_test_base.cc ('k') | extensions/renderer/mojo/keep_alive_client_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698