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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: mojo/shell/context.cc

Issue 1052103005: Documents what ApplicationManager::Delegate do (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: dont nuke Created 5 years, 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « mojo/shell/context.h ('k') | mojo/shell/native_runner_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/shell/context.cc
diff --git a/mojo/shell/context.cc b/mojo/shell/context.cc
index f938980c60105f1cdab894d93a9bbe76322079bb..593dd1dd40744a8fb7ff07828d5778f5e7b419d6 100644
--- a/mojo/shell/context.cc
+++ b/mojo/shell/context.cc
@@ -285,14 +285,14 @@ void Context::Shutdown() {
base::MessageLoop::current()->Run();
}
-GURL Context::ResolveURL(const GURL& url) {
- return url_resolver_.ResolveMojoURL(url);
-}
-
GURL Context::ResolveMappings(const GURL& url) {
return url_resolver_.ApplyMappings(url);
}
+GURL Context::ResolveMojoURL(const GURL& url) {
+ return url_resolver_.ResolveMojoURL(url);
+}
+
void Context::OnShutdownComplete() {
DCHECK_EQ(base::MessageLoop::current()->task_runner(),
task_runners_->shell_runner());
« no previous file with comments | « mojo/shell/context.h ('k') | mojo/shell/native_runner_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698