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

Unified Diff: shell/application_manager/application_manager.cc

Issue 866283007: clang-format //shell and add a PRESUBMIT.py to keep it clang-formatted. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Remove virtual when there's override. 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
Index: shell/application_manager/application_manager.cc
diff --git a/shell/application_manager/application_manager.cc b/shell/application_manager/application_manager.cc
index 9ceaac2662e9d7c47f28b5d3d9ad871fb77e190f..f0c4bac91d2d1e031750b61db2ab00761e1c8a0f 100644
--- a/shell/application_manager/application_manager.cc
+++ b/shell/application_manager/application_manager.cc
@@ -24,7 +24,6 @@ namespace {
bool has_created_instance = false;
} // namespace
-
ApplicationManager::Delegate::~Delegate() {
}
@@ -85,8 +84,7 @@ bool ApplicationManager::TestAPI::HasFactoryForURL(const GURL& url) const {
}
ApplicationManager::ApplicationManager(Delegate* delegate)
- : delegate_(delegate),
- weak_ptr_factory_(this) {
+ : delegate_(delegate), weak_ptr_factory_(this) {
}
ApplicationManager::~ApplicationManager() {
@@ -237,7 +235,8 @@ void ApplicationManager::SetArgsForURL(const std::vector<std::string>& args,
}
ApplicationLoader* ApplicationManager::GetLoaderForURL(
- const GURL& url, IncludeDefaultLoader include_default_loader) {
+ const GURL& url,
+ IncludeDefaultLoader include_default_loader) {
auto url_it = url_to_loader_.find(url);
if (url_it != url_to_loader_.end())
return url_it->second;
@@ -258,8 +257,8 @@ void ApplicationManager::OnShellImplError(ShellImpl* shell_impl) {
DCHECK(it != url_to_shell_impl_.end());
delete it->second;
url_to_shell_impl_.erase(it);
- ApplicationLoader* loader = GetLoaderForURL(requested_url,
- INCLUDE_DEFAULT_LOADER);
+ ApplicationLoader* loader =
+ GetLoaderForURL(requested_url, INCLUDE_DEFAULT_LOADER);
if (loader)
loader->OnApplicationError(this, url);
delegate_->OnApplicationError(requested_url);
« no previous file with comments | « shell/application_manager/application_manager.h ('k') | shell/application_manager/application_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698