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

Unified Diff: chrome/browser/ui/ash/multi_user/user_switch_util.h

Issue 2144083002: mash: Move user_switch_util to chrome. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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: chrome/browser/ui/ash/multi_user/user_switch_util.h
diff --git a/ash/system/chromeos/multi_user/user_switch_util.h b/chrome/browser/ui/ash/multi_user/user_switch_util.h
similarity index 58%
rename from ash/system/chromeos/multi_user/user_switch_util.h
rename to chrome/browser/ui/ash/multi_user/user_switch_util.h
index 66e0073e438d0bfe504caac650a55a5bf44e34c6..aa94d8127ad69e9b202fb6abfffa85ad4fa7a2d7 100644
--- a/ash/system/chromeos/multi_user/user_switch_util.h
+++ b/chrome/browser/ui/ash/multi_user/user_switch_util.h
@@ -2,25 +2,19 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_SYSTEM_CHROMEOS_MULTI_USER_MULTI_USER_SWITCH_UTIL_H_
-#define ASH_SYSTEM_CHROMEOS_MULTI_USER_MULTI_USER_SWITCH_UTIL_H_
+#ifndef CHROME_BROWSER_UI_ASH_MULTI_USER_USER_SWITCH_UTIL_H_
+#define CHROME_BROWSER_UI_ASH_MULTI_USER_USER_SWITCH_UTIL_H_
-#include "ash/ash_export.h"
#include "base/callback.h"
-namespace ash {
-
// Tries to switch to a new user by first checking if desktop casting / sharing
// is going on, and let the user decide if he wants to terminate it or not.
// After terminating any desktop sharing operations, the |switch_user| function
// will be called.
-void ASH_EXPORT
-TrySwitchingActiveUser(const base::Callback<void()> switch_user);
+void TrySwitchingActiveUser(const base::Callback<void()> switch_user);
// Terminates the "DesktopCastingWarning" dialog from a unit tests and |accept|s
// it. False will be returned if there was no dialog shown.
-bool ASH_EXPORT TestAndTerminateDesktopCastingWarningForTest(bool accept);
-
-} // namespace chromeos
+bool TestAndTerminateDesktopCastingWarningForTest(bool accept);
-#endif // ASH_SYSTEM_CHROMEOS_MULTI_USER_MULTI_USER_SWITCH_UTIL_H_
+#endif // CHROME_BROWSER_UI_ASH_MULTI_USER_USER_SWITCH_UTIL_H_

Powered by Google App Engine
This is Rietveld 408576698