Badge teleported windows in Refresh on ChromeOS

Adds back parts of ShouldShowProfileIndicatorIcon on ChromeOS under
Refresh. This indicator should now show under Refresh but only for
teleported browser windows.

Bug: chromium:834524
Change-Id: I40e4233f2ffdf6df3f07ee6b0cc41e9d5b5f6a9a
Reviewed-on: https://chromium-review.googlesource.com/1105278
Commit-Queue: Peter Boström <pbos@chromium.org>
Reviewed-by: Bret Sepulveda <bsep@chromium.org>
Cr-Commit-Position: refs/heads/master@{#568247}

chrome/browser/ui/views/frame/browser_non_client_frame_view.cc

@@ -509,21 +509,23 @@ void BrowserNonClientFrameView::UpdateTaskbarDecoration() {
 }
 
 bool BrowserNonClientFrameView::ShouldShowProfileIndicatorIcon() const {
-  // In Material Refresh, we use a toolbar button for all
-  // profile/incognito-related purposes.
+#if !defined(OS_CHROMEOS)
+  // Outside ChromeOS, in Material Refresh, we use a toolbar button for all
+  // profile/incognito-related purposes. ChromeOS uses it for teleportation (see
+  // below).
   if (MD::IsRefreshUi())
     return false;
+#endif  // !defined(OS_CHROMEOS)
 
   Browser* browser = browser_view()->browser();
   Profile* profile = browser->profile();
   const bool is_incognito =
       profile->GetProfileType() == Profile::INCOGNITO_PROFILE;
 
-  // In the touch-optimized UI, we don't show the incognito icon in the browser
-  // frame. It's instead shown in the new tab button. However, we still show an
-  // avatar icon for the teleported browser windows between multi-user sessions
-  // (Chrome OS only). Note that you can't teleport an incognito window.
-  if (is_incognito && MD::IsTouchOptimizedUiEnabled())
+  // In newer material UIs we only show the avatar icon for the teleported
+  // browser windows between multi-user sessions (Chrome OS only). Note that you
+  // can't teleport an incognito window.
+  if (is_incognito && MD::IsNewerMaterialUi())
     return false;
 
 #if defined(OS_CHROMEOS)