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

Unified Diff: chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.cc

Issue 89243003: Move EmptyString, kWhitespace and the BOM to base. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 1 month 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/multi_user_window_manager_chromeos.cc
diff --git a/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.cc b/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.cc
index 824ddf7539024c52588c85ee935c6a1315f9da47..a3344a34e07bc781ad2f072f38d14cefb81a9356 100644
--- a/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.cc
+++ b/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.cc
@@ -209,7 +209,8 @@ void MultiUserWindowManagerChromeOS::SetWindowOwner(
const std::string& MultiUserWindowManagerChromeOS::GetWindowOwner(
aura::Window* window) {
WindowToEntryMap::iterator it = window_to_entry_.find(window);
- return it != window_to_entry_.end() ? it->second->owner() : EmptyString();
+ return it != window_to_entry_.end() ? it->second->owner()
+ : base::EmptyString();
}
void MultiUserWindowManagerChromeOS::ShowWindowForUser(
@@ -264,7 +265,7 @@ const std::string& MultiUserWindowManagerChromeOS::GetUserPresentingWindow(
// If the window is not owned by anyone it is shown on all desktops and we
// return the empty string.
if (it == window_to_entry_.end())
- return EmptyString();
+ return base::EmptyString();
// Otherwise we ask the object for its desktop.
return it->second->show_for_user();
}
« no previous file with comments | « chrome/browser/signin/token_service.cc ('k') | chrome/browser/ui/ash/multi_user/multi_user_window_manager_stub.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698