projects
/
platform
/
framework
/
web
/
crosswalk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Upstream version 5.34.104.0
[platform/framework/web/crosswalk.git]
/
src
/
chrome
/
browser
/
profiles
/
avatar_menu_actions_desktop.cc
diff --git
a/src/chrome/browser/profiles/avatar_menu_actions_desktop.cc
b/src/chrome/browser/profiles/avatar_menu_actions_desktop.cc
index
db77ac2
..
7664b61
100644
(file)
--- a/
src/chrome/browser/profiles/avatar_menu_actions_desktop.cc
+++ b/
src/chrome/browser/profiles/avatar_menu_actions_desktop.cc
@@
-64,7
+64,7
@@
bool AvatarMenuActionsDesktop::ShouldShowAddNewProfileLink() const {
// |browser_| can be NULL in unit_tests.
if (browser_ && browser_->profile()->IsManaged())
return false;
// |browser_| can be NULL in unit_tests.
if (browser_ && browser_->profile()->IsManaged())
return false;
-#if defined(
USE_AURA) && defined(
OS_WIN)
+#if defined(OS_WIN)
return chrome::GetActiveDesktop() != chrome::HOST_DESKTOP_TYPE_ASH;
#else
return true;
return chrome::GetActiveDesktop() != chrome::HOST_DESKTOP_TYPE_ASH;
#else
return true;
@@
-72,7
+72,7
@@
bool AvatarMenuActionsDesktop::ShouldShowAddNewProfileLink() const {
}
bool AvatarMenuActionsDesktop::ShouldShowEditProfileLink() const {
}
bool AvatarMenuActionsDesktop::ShouldShowEditProfileLink() const {
-#if defined(
USE_AURA) && defined(
OS_WIN)
+#if defined(OS_WIN)
return chrome::GetActiveDesktop() != chrome::HOST_DESKTOP_TYPE_ASH;
#else
return true;
return chrome::GetActiveDesktop() != chrome::HOST_DESKTOP_TYPE_ASH;
#else
return true;