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

Unified Diff: chrome/browser/ui/views/status_bubble_views.cc

Issue 2578893003: Converts chrome to aura-mus (Closed)
Patch Set: merge again Created 4 years 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/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 42eb70ec613bcdb2fbeb7d349fcbc426da79fff6..db6e54c78195dda5189d068c85d3bbb96b0b2a9c 100644
--- a/chrome/browser/ui/views/status_bubble_views.cc
+++ b/chrome/browser/ui/views/status_bubble_views.cc
@@ -18,6 +18,7 @@
#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"
@@ -663,8 +664,13 @@ void StatusBubbleViews::Init() {
popup_->SetOpacity(0.f);
popup_->SetContentsView(view_);
#if defined(USE_ASH)
- ash::wm::GetWindowState(popup_->GetNativeWindow())->
- set_ignored_by_shelf(true);
+ // 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);
+ }
#endif
RepositionPopup();
}

Powered by Google App Engine
This is Rietveld 408576698