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

Unified Diff: shell/application_manager/network_fetcher.cc

Issue 972433004: Use the mojo::shell namespace consistently underly shell/. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Java! Created 5 years, 10 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 | « shell/application_manager/network_fetcher.h ('k') | shell/application_manager/shell_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: shell/application_manager/network_fetcher.cc
diff --git a/shell/application_manager/network_fetcher.cc b/shell/application_manager/network_fetcher.cc
index 01bdc3edc24271cabaaf092b7d3934f75533ac38..8ebcf3e290c8f9e218235ff7d4dcc6a6eabdd3d9 100644
--- a/shell/application_manager/network_fetcher.cc
+++ b/shell/application_manager/network_fetcher.cc
@@ -22,6 +22,7 @@
#include "shell/application_manager/data_pipe_peek.h"
namespace mojo {
+namespace shell {
NetworkFetcher::NetworkFetcher(bool disable_cache,
const GURL& url,
@@ -167,14 +168,14 @@ std::string NetworkFetcher::MimeType() {
bool NetworkFetcher::HasMojoMagic() {
std::string magic;
- return shell::BlockingPeekNBytes(response_->body.get(), &magic,
- strlen(kMojoMagic), kPeekTimeout) &&
+ return BlockingPeekNBytes(response_->body.get(), &magic, strlen(kMojoMagic),
+ kPeekTimeout) &&
magic == kMojoMagic;
}
bool NetworkFetcher::PeekFirstLine(std::string* line) {
- return shell::BlockingPeekLine(response_->body.get(), line, kMaxShebangLength,
- kPeekTimeout);
+ return BlockingPeekLine(response_->body.get(), line, kMaxShebangLength,
+ kPeekTimeout);
}
void NetworkFetcher::StartNetworkRequest(const GURL& url,
@@ -211,4 +212,5 @@ void NetworkFetcher::OnLoadComplete(URLResponsePtr response) {
loader_callback_.Run(make_scoped_ptr(this));
}
+} // namespace shell
} // namespace mojo
« no previous file with comments | « shell/application_manager/network_fetcher.h ('k') | shell/application_manager/shell_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698