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

Unified Diff: chrome/browser/ui/apps/apps_metro_handler_win.cc

Issue 494033002: Move AppWindow to extensions (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove unneeded include in chrome_shell_delegate.cc Created 6 years, 4 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: chrome/browser/ui/apps/apps_metro_handler_win.cc
diff --git a/chrome/browser/ui/apps/apps_metro_handler_win.cc b/chrome/browser/ui/apps/apps_metro_handler_win.cc
index 8d212e8c163ed47285a9144c4092d6eb02b776b1..49af8e8f7cc1843bbcd3926f5dbc8b3e67310663 100644
--- a/chrome/browser/ui/apps/apps_metro_handler_win.cc
+++ b/chrome/browser/ui/apps/apps_metro_handler_win.cc
@@ -4,12 +4,12 @@
#include "chrome/browser/ui/apps/apps_metro_handler_win.h"
-#include "apps/app_window.h"
-#include "apps/app_window_registry.h"
#include "chrome/app/chrome_command_ids.h"
#include "chrome/browser/ui/simple_message_box.h"
#include "chrome/grit/chromium_strings.h"
#include "chrome/grit/generated_resources.h"
+#include "extensions/browser/app_window/app_window.h"
+#include "extensions/browser/app_window/app_window_registry.h"
#include "ui/base/l10n/l10n_util.h"
bool VerifyASHSwitchForApps(gfx::NativeWindow parent_window,
@@ -17,8 +17,8 @@ bool VerifyASHSwitchForApps(gfx::NativeWindow parent_window,
DCHECK(win_restart_command_id == IDC_WIN_DESKTOP_RESTART ||
win_restart_command_id == IDC_WIN8_METRO_RESTART ||
win_restart_command_id == IDC_WIN_CHROMEOS_RESTART);
- if (!apps::AppWindowRegistry::IsAppWindowRegisteredInAnyProfile(
- apps::AppWindow::WINDOW_TYPE_DEFAULT)) {
+ if (!extensions::AppWindowRegistry::IsAppWindowRegisteredInAnyProfile(
+ extensions::AppWindow::WINDOW_TYPE_DEFAULT)) {
return true;
}
« no previous file with comments | « chrome/browser/power/process_power_collector_unittest.cc ('k') | chrome/browser/ui/apps/chrome_apps_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698