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

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

Issue 22992003: Moved chrome/browser/ui/extensions apps code to chrome/browser/ui/apps (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Win compile Created 7 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
« no previous file with comments | « chrome/browser/ui/apps/apps_metro_handler_win.h ('k') | chrome/browser/ui/browser_command_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/apps/apps_metro_handler_win.cc
diff --git a/chrome/browser/ui/extensions/apps_metro_handler_win.cc b/chrome/browser/ui/apps/apps_metro_handler_win.cc
similarity index 76%
rename from chrome/browser/ui/extensions/apps_metro_handler_win.cc
rename to chrome/browser/ui/apps/apps_metro_handler_win.cc
index f59f67535f014cfd2d64e6289e28468403ca61aa..d10bf2bfa9fcc95c6021ac65dbf08f4127e9096f 100644
--- a/chrome/browser/ui/extensions/apps_metro_handler_win.cc
+++ b/chrome/browser/ui/apps/apps_metro_handler_win.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 "chrome/browser/ui/extensions/apps_metro_handler_win.h"
+#include "chrome/browser/ui/apps/apps_metro_handler_win.h"
#include "apps/shell_window.h"
#include "apps/shell_window_registry.h"
@@ -11,21 +11,17 @@
#include "grit/generated_resources.h"
#include "ui/base/l10n/l10n_util.h"
-namespace chrome {
-
bool VerifySwitchToMetroForApps(gfx::NativeWindow parent_window) {
if (!apps::ShellWindowRegistry::IsShellWindowRegisteredInAnyProfile(
apps::ShellWindow::WINDOW_TYPE_DEFAULT)) {
return true;
}
- MessageBoxResult result = ShowMessageBox(
+ chrome::MessageBoxResult result = chrome::ShowMessageBox(
parent_window,
l10n_util::GetStringUTF16(IDS_PRODUCT_NAME),
l10n_util::GetStringUTF16(IDS_WIN8_PROMPT_TO_CLOSE_APPS_FOR_METRO),
- MESSAGE_BOX_TYPE_OK_CANCEL);
+ chrome::MESSAGE_BOX_TYPE_OK_CANCEL);
- return result == MESSAGE_BOX_RESULT_YES;
+ return result == chrome::MESSAGE_BOX_RESULT_YES;
}
-
-} // namespace chrome
« no previous file with comments | « chrome/browser/ui/apps/apps_metro_handler_win.h ('k') | chrome/browser/ui/browser_command_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698