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

Side by Side Diff: shell/application_manager/fetcher.cc

Issue 1067173003: Remove mojo:: part of mojo::shell:: nested namespace in //shell. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: 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 unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 "shell/application_manager/fetcher.h" 5 #include "shell/application_manager/fetcher.h"
6 6
7 #include "url/gurl.h" 7 #include "url/gurl.h"
8 8
9 namespace mojo {
10 namespace shell { 9 namespace shell {
11 10
12 const char Fetcher::kMojoMagic[] = "#!mojo "; 11 const char Fetcher::kMojoMagic[] = "#!mojo ";
13 const size_t Fetcher::kMaxShebangLength = 2048; 12 const size_t Fetcher::kMaxShebangLength = 2048;
14 13
15 Fetcher::Fetcher(const FetchCallback& loader_callback) 14 Fetcher::Fetcher(const FetchCallback& loader_callback)
16 : loader_callback_(loader_callback) { 15 : loader_callback_(loader_callback) {
17 } 16 }
18 17
19 Fetcher::~Fetcher() { 18 Fetcher::~Fetcher() {
20 } 19 }
21 20
22 bool Fetcher::PeekContentHandler(std::string* mojo_shebang, 21 bool Fetcher::PeekContentHandler(std::string* mojo_shebang,
23 GURL* mojo_content_handler_url) { 22 GURL* mojo_content_handler_url) {
24 // TODO(aa): I guess this should just go in ApplicationManager now. 23 // TODO(aa): I guess this should just go in ApplicationManager now.
25 std::string shebang; 24 std::string shebang;
26 if (HasMojoMagic() && PeekFirstLine(&shebang)) { 25 if (HasMojoMagic() && PeekFirstLine(&shebang)) {
27 GURL url(shebang.substr(arraysize(kMojoMagic) - 1, std::string::npos)); 26 GURL url(shebang.substr(arraysize(kMojoMagic) - 1, std::string::npos));
28 if (url.is_valid()) { 27 if (url.is_valid()) {
29 *mojo_shebang = shebang; 28 *mojo_shebang = shebang;
30 *mojo_content_handler_url = url; 29 *mojo_content_handler_url = url;
31 return true; 30 return true;
32 } 31 }
33 } 32 }
34 return false; 33 return false;
35 } 34 }
36 35
37 } // namespace shell 36 } // namespace shell
38 } // namespace mojo
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698