Index: extensions/shell/common/shell_content_client.cc |
diff --git a/apps/shell/common/shell_content_client.cc b/extensions/shell/common/shell_content_client.cc |
similarity index 77% |
rename from apps/shell/common/shell_content_client.cc |
rename to extensions/shell/common/shell_content_client.cc |
index 37b6aedcc1f6c8b6c61f4907c4b560ed6d5a9a9a..47ed3869c69bf39dbbe07a495461514f8cd168e7 100644 |
--- a/apps/shell/common/shell_content_client.cc |
+++ b/extensions/shell/common/shell_content_client.cc |
@@ -2,7 +2,7 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#include "apps/shell/common/shell_content_client.h" |
+#include "extensions/shell/common/shell_content_client.h" |
#include "base/strings/string_piece.h" |
#include "base/strings/utf_string_conversions.h" |
@@ -11,19 +11,21 @@ |
#include "ui/base/l10n/l10n_util.h" |
#include "ui/base/resource/resource_bundle.h" |
-namespace apps { |
+namespace extensions { |
-ShellContentClient::ShellContentClient() {} |
+ShellContentClient::ShellContentClient() { |
+} |
-ShellContentClient::~ShellContentClient() {} |
+ShellContentClient::~ShellContentClient() { |
+} |
void ShellContentClient::AddAdditionalSchemes( |
std::vector<std::string>* standard_schemes, |
std::vector<std::string>* savable_schemes) { |
- standard_schemes->push_back(extensions::kExtensionScheme); |
- savable_schemes->push_back(extensions::kExtensionScheme); |
- standard_schemes->push_back(extensions::kExtensionResourceScheme); |
- savable_schemes->push_back(extensions::kExtensionResourceScheme); |
+ standard_schemes->push_back(kExtensionScheme); |
+ savable_schemes->push_back(kExtensionScheme); |
+ standard_schemes->push_back(kExtensionResourceScheme); |
+ savable_schemes->push_back(kExtensionResourceScheme); |
} |
std::string ShellContentClient::GetUserAgent() const { |
@@ -52,4 +54,4 @@ gfx::Image& ShellContentClient::GetNativeImageNamed(int resource_id) const { |
return ResourceBundle::GetSharedInstance().GetNativeImageNamed(resource_id); |
} |
-} // namespace apps |
+} // namespace extensions |