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

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

Issue 10375021: Move Extension into extensions namespace (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Take 6 Created 8 years, 7 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/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/bind.h" 10 #include "base/bind.h"
(...skipping 393 matching lines...) Expand 10 before | Expand all | Expand 10 after
404 404
405 void NaClProcessHost::OnNaClGdbAttached() { 405 void NaClProcessHost::OnNaClGdbAttached() {
406 wait_for_nacl_gdb_ = false; 406 wait_for_nacl_gdb_ = false;
407 nacl_gdb_watcher_.StopWatchingFileDescriptor(); 407 nacl_gdb_watcher_.StopWatchingFileDescriptor();
408 nacl_gdb_watcher_delegate_.reset(); 408 nacl_gdb_watcher_delegate_.reset();
409 OnProcessLaunched(); 409 OnProcessLaunched();
410 } 410 }
411 #endif 411 #endif
412 412
413 FilePath NaClProcessHost::GetManifestPath() { 413 FilePath NaClProcessHost::GetManifestPath() {
414 const Extension* extension = extension_info_map_->extensions() 414 const extensions::Extension* extension = extension_info_map_->extensions()
415 .GetExtensionOrAppByURL(ExtensionURLInfo(manifest_url_)); 415 .GetExtensionOrAppByURL(ExtensionURLInfo(manifest_url_));
416 if (extension != NULL && manifest_url_.SchemeIs(chrome::kExtensionScheme)) { 416 if (extension != NULL && manifest_url_.SchemeIs(chrome::kExtensionScheme)) {
417 std::string path = manifest_url_.path(); 417 std::string path = manifest_url_.path();
418 TrimString(path, "/", &path); // Remove first slash 418 TrimString(path, "/", &path); // Remove first slash
419 return extension->path().AppendASCII(path); 419 return extension->path().AppendASCII(path);
420 } 420 }
421 return FilePath(); 421 return FilePath();
422 } 422 }
423 423
424 bool NaClProcessHost::LaunchSelLdr() { 424 bool NaClProcessHost::LaunchSelLdr() {
(...skipping 332 matching lines...) Expand 10 before | Expand all | Expand 10 after
757 } else { 757 } else {
758 NaClStartDebugExceptionHandlerThread( 758 NaClStartDebugExceptionHandlerThread(
759 process_handle.Take(), info, 759 process_handle.Take(), info,
760 base::MessageLoopProxy::current(), 760 base::MessageLoopProxy::current(),
761 base::Bind(&NaClProcessHost::OnDebugExceptionHandlerLaunchedByBroker, 761 base::Bind(&NaClProcessHost::OnDebugExceptionHandlerLaunchedByBroker,
762 weak_factory_.GetWeakPtr())); 762 weak_factory_.GetWeakPtr()));
763 return true; 763 return true;
764 } 764 }
765 } 765 }
766 #endif 766 #endif
OLDNEW
« no previous file with comments | « chrome/browser/memory_details.cc ('k') | chrome/browser/notifications/desktop_notification_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698