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

Unified Diff: extensions/shell/browser/shell_extension_system.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
Index: extensions/shell/browser/shell_extension_system.cc
diff --git a/apps/shell/browser/shell_extension_system.cc b/extensions/shell/browser/shell_extension_system.cc
similarity index 90%
rename from apps/shell/browser/shell_extension_system.cc
rename to extensions/shell/browser/shell_extension_system.cc
index bbc7278a6617c0f1564414d53faace2271c6d641..06d39ab7e8227900db41e8dbca7d3a6eb3184c44 100644
--- a/apps/shell/browser/shell_extension_system.cc
+++ b/extensions/shell/browser/shell_extension_system.cc
@@ -2,11 +2,10 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "apps/shell/browser/shell_extension_system.h"
+#include "extensions/shell/browser/shell_extension_system.h"
#include <string>
-#include "apps/shell/browser/api/shell/shell_api.h"
#include "base/file_util.h"
#include "base/files/file_path.h"
#include "chrome/browser/chrome_notification_types.h"
@@ -25,6 +24,7 @@
#include "extensions/browser/quota_service.h"
#include "extensions/browser/runtime_data.h"
#include "extensions/common/file_util.h"
+#include "extensions/shell/browser/api/shell/shell_api.h"
using content::BrowserContext;
using content::BrowserThread;
@@ -49,7 +49,7 @@ bool ShellExtensionSystem::LoadApp(const base::FilePath& app_dir) {
app_dir, Manifest::COMMAND_LINE, load_flags, &load_error);
if (!extension_) {
LOG(ERROR) << "Loading extension at " << app_dir.value()
- << " failed with: " << load_error;
+ << " failed with: " << load_error;
return false;
}
app_id_ = extension_->id();
@@ -164,11 +164,14 @@ QuotaService* ShellExtensionSystem::quota_service() {
void ShellExtensionSystem::RegisterExtensionWithRequestContexts(
const Extension* extension) {
- BrowserThread::PostTask(
- BrowserThread::IO, FROM_HERE,
- base::Bind(&InfoMap::AddExtension, info_map(),
- make_scoped_refptr(extension), base::Time::Now(),
- false, false));
+ BrowserThread::PostTask(BrowserThread::IO,
+ FROM_HERE,
+ base::Bind(&InfoMap::AddExtension,
+ info_map(),
+ make_scoped_refptr(extension),
+ base::Time::Now(),
+ false,
+ false));
}
void ShellExtensionSystem::UnregisterExtensionWithRequestContexts(
« no previous file with comments | « extensions/shell/browser/shell_extension_system.h ('k') | extensions/shell/browser/shell_extension_system_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698