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

Unified Diff: extensions/renderer/dispatcher.cc

Issue 2551303003: Remove unused packaged app window controls code. (Closed)
Patch Set: Feedback Created 4 years 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 side-by-side diff with in-line comments
Download patch
Index: extensions/renderer/dispatcher.cc
diff --git a/extensions/renderer/dispatcher.cc b/extensions/renderer/dispatcher.cc
index 06423905ecf76581ab839d0ee06431ce26b68f22..c83751756e11b998df6380db708f9d9833f00558 100644
--- a/extensions/renderer/dispatcher.cc
+++ b/extensions/renderer/dispatcher.cc
@@ -349,14 +349,13 @@ void Dispatcher::DidCreateScriptContext(
bindings_system_->DidCreateScriptContext(context);
UpdateBindingsForContext(context);
- bool is_within_platform_app = IsWithinPlatformApp();
// Inject custom JS into the platform app context.
- if (is_within_platform_app) {
+ if (IsWithinPlatformApp()) {
module_system->Require("platformApp");
}
RequireGuestViewModules(context);
- delegate_->RequireAdditionalModules(context, is_within_platform_app);
+ delegate_->RequireAdditionalModules(context);
const base::TimeDelta elapsed = base::TimeTicks::Now() - start_time;
switch (context->context_type()) {
@@ -465,8 +464,7 @@ void Dispatcher::DidInitializeServiceWorkerContextOnWorkerThread(
// TODO(lazyboy): Get rid of RequireGuestViewModules() as this doesn't seem
// necessary for Extension SW.
RequireGuestViewModules(context);
- delegate_->RequireAdditionalModules(context,
- false /* is_within_platform_app */);
+ delegate_->RequireAdditionalModules(context);
}
g_worker_script_context_set.Get().Insert(base::WrapUnique(context));
@@ -790,7 +788,6 @@ std::vector<std::pair<std::string, int> > Dispatcher::GetJsResources() {
IDR_PRINTER_PROVIDER_CUSTOM_BINDINGS_JS));
resources.push_back(
std::make_pair("runtime", IDR_RUNTIME_CUSTOM_BINDINGS_JS));
- resources.push_back(std::make_pair("windowControls", IDR_WINDOW_CONTROLS_JS));
resources.push_back(
std::make_pair("webViewRequest",
IDR_WEB_VIEW_REQUEST_CUSTOM_BINDINGS_JS));

Powered by Google App Engine
This is Rietveld 408576698