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

Side by Side Diff: chrome/browser/nacl_host/nacl_process_host.cc

Issue 16625012: Remove ExtensionURLInfo, make security decisions in render process (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 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/browser/nacl_host/nacl_process_host.h" 5 #include "chrome/browser/nacl_host/nacl_process_host.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/base_switches.h" 10 #include "base/base_switches.h"
(...skipping 483 matching lines...) Expand 10 before | Expand all | Expand 10 after
494 void NaClProcessHost::OnNaClGdbAttached() { 494 void NaClProcessHost::OnNaClGdbAttached() {
495 wait_for_nacl_gdb_ = false; 495 wait_for_nacl_gdb_ = false;
496 nacl_gdb_watcher_.StopWatchingFileDescriptor(); 496 nacl_gdb_watcher_.StopWatchingFileDescriptor();
497 nacl_gdb_watcher_delegate_.reset(); 497 nacl_gdb_watcher_delegate_.reset();
498 OnProcessLaunched(); 498 OnProcessLaunched();
499 } 499 }
500 #endif 500 #endif
501 501
502 base::FilePath NaClProcessHost::GetManifestPath() { 502 base::FilePath NaClProcessHost::GetManifestPath() {
503 const extensions::Extension* extension = extension_info_map_->extensions() 503 const extensions::Extension* extension = extension_info_map_->extensions()
504 .GetExtensionOrAppByURL(ExtensionURLInfo(manifest_url_)); 504 .GetExtensionOrAppByURL(manifest_url_);
505 if (extension != NULL && 505 if (extension != NULL &&
506 manifest_url_.SchemeIs(extensions::kExtensionScheme)) { 506 manifest_url_.SchemeIs(extensions::kExtensionScheme)) {
507 std::string path = manifest_url_.path(); 507 std::string path = manifest_url_.path();
508 TrimString(path, "/", &path); // Remove first slash 508 TrimString(path, "/", &path); // Remove first slash
509 return extension->path().AppendASCII(path); 509 return extension->path().AppendASCII(path);
510 } 510 }
511 return base::FilePath(); 511 return base::FilePath();
512 } 512 }
513 513
514 bool NaClProcessHost::LaunchSelLdr() { 514 bool NaClProcessHost::LaunchSelLdr() {
(...skipping 553 matching lines...) Expand 10 before | Expand all | Expand 10 after
1068 } else { 1068 } else {
1069 NaClStartDebugExceptionHandlerThread( 1069 NaClStartDebugExceptionHandlerThread(
1070 process_handle.Take(), info, 1070 process_handle.Take(), info,
1071 base::MessageLoopProxy::current(), 1071 base::MessageLoopProxy::current(),
1072 base::Bind(&NaClProcessHost::OnDebugExceptionHandlerLaunchedByBroker, 1072 base::Bind(&NaClProcessHost::OnDebugExceptionHandlerLaunchedByBroker,
1073 weak_factory_.GetWeakPtr())); 1073 weak_factory_.GetWeakPtr()));
1074 return true; 1074 return true;
1075 } 1075 }
1076 } 1076 }
1077 #endif 1077 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698