Revert of Converts chrome to aura-mus

chrome/browser/ui/views/status_bubble_views.cc

Index: chrome/browser/ui/views/status_bubble_views.cc
diff --git a/chrome/browser/ui/views/status_bubble_views.cc b/chrome/browser/ui/views/status_bubble_views.cc
index db6e54c78195dda5189d068c85d3bbb96b0b2a9c..42eb70ec613bcdb2fbeb7d349fcbc426da79fff6 100644
--- a/chrome/browser/ui/views/status_bubble_views.cc
+++ b/chrome/browser/ui/views/status_bubble_views.cc
@@ -18,7 +18,6 @@
 #include "chrome/browser/themes/theme_properties.h"
 #include "components/url_formatter/elide_url.h"
 #include "components/url_formatter/url_formatter.h"
-#include "services/service_manager/runner/common/client_util.h"
 #include "third_party/skia/include/core/SkPaint.h"
 #include "third_party/skia/include/core/SkPath.h"
 #include "third_party/skia/include/pathops/SkPathOps.h"
@@ -664,13 +663,8 @@
     popup_->SetOpacity(0.f);
     popup_->SetContentsView(view_);
 #if defined(USE_ASH)
-    // TODO: http://crbug.com/671729 convert to WindowProperty (and then can
-    // remove explicit kWindowIgnoredByShelf_Property above and make this ifdef
-    // USE_AURA).
-    if (!service_manager::ServiceManagerIsRemote()) {
-      ash::wm::GetWindowState(popup_->GetNativeWindow())
-          ->set_ignored_by_shelf(true);
-    }
+    ash::wm::GetWindowState(popup_->GetNativeWindow())->
+        set_ignored_by_shelf(true);
 #endif
     RepositionPopup();
   }