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

Unified Diff: extensions/shell/common/shell_content_client.cc

Issue 412713002: Move apps/shell to extensions/shell. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 40% Created 6 years, 5 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 | « extensions/shell/common/shell_content_client.h ('k') | extensions/shell/common/shell_extensions_client.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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
« no previous file with comments | « extensions/shell/common/shell_content_client.h ('k') | extensions/shell/common/shell_extensions_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698