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

Unified Diff: chrome/browser/apps/app_launch_for_metro_restart_win.cc

Issue 25034003: Moved apps metro code from apps to chrome/browser/apps. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase and fix unit test Created 7 years, 2 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 | « chrome/browser/apps/app_launch_for_metro_restart_win.h ('k') | chrome/browser/apps/chrome_apps_client.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/apps/app_launch_for_metro_restart_win.cc
diff --git a/apps/app_launch_for_metro_restart_win.cc b/chrome/browser/apps/app_launch_for_metro_restart_win.cc
similarity index 88%
rename from apps/app_launch_for_metro_restart_win.cc
rename to chrome/browser/apps/app_launch_for_metro_restart_win.cc
index 2b102743326b8c45dbf873587c21dfb1bb84a60f..a55cb33fd49a2b707112eb564eaae63ca40a4ee2 100644
--- a/apps/app_launch_for_metro_restart_win.cc
+++ b/chrome/browser/apps/app_launch_for_metro_restart_win.cc
@@ -2,13 +2,14 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "apps/app_launch_for_metro_restart_win.h"
+#include "chrome/browser/apps/app_launch_for_metro_restart_win.h"
#include "apps/launcher.h"
#include "apps/pref_names.h"
#include "base/bind.h"
#include "base/files/file_path.h"
#include "base/message_loop/message_loop.h"
+#include "base/prefs/pref_registry_simple.h"
#include "base/prefs/pref_service.h"
#include "base/time/time.h"
#include "chrome/browser/browser_process.h"
@@ -17,12 +18,13 @@
#include "chrome/browser/extensions/extension_system.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/profiles/profile_manager.h"
+#include "chrome/common/pref_names.h"
#include "win8/util/win8_util.h"
using extensions::Extension;
using extensions::ExtensionSystem;
-namespace apps {
+namespace app_metro_launch {
namespace {
@@ -90,4 +92,9 @@ void SetAppLaunchForMetroRestart(Profile* profile,
prefs->SetString(prefs::kAppLaunchForMetroRestart, extension_id);
}
-} // namespace apps
+void RegisterPrefs(PrefRegistrySimple* registry) {
+ registry->RegisterStringPref(prefs::kAppLaunchForMetroRestart, "");
+ registry->RegisterStringPref(prefs::kAppLaunchForMetroRestartProfile, "");
+}
+
+} // namespace app_metro_launch
« no previous file with comments | « chrome/browser/apps/app_launch_for_metro_restart_win.h ('k') | chrome/browser/apps/chrome_apps_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698