Renames kWindowIgnoredByShelf_Property to ..._InitProperty

chrome/browser/ui/views/status_bubble_views.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/status_bubble_views.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/i18n/rtl.h"
@@ skipping 637 matching lines @@
     // revert this change once http://crbug.com/125248 is fixed.
     params.force_software_compositing = true;
 #endif
     params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW;
     params.accept_events = false;
     params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
     params.parent = frame->GetNativeView();
     params.context = frame->GetNativeWindow();
 #if defined(USE_AURA)
     params.mus_properties
-        [ui::mojom::WindowManager::kWindowIgnoredByShelf_Property] =
+        [ui::mojom::WindowManager::kWindowIgnoredByShelf_InitProperty] =
         mojo::ConvertTo<std::vector<uint8_t>>(true);
 #endif
     popup_->Init(params);
     // We do our own animation and don't want any from the system.
     popup_->SetVisibilityChangedAnimationsEnabled(false);
     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 defined(OS_CHROMEOS)
     if (!service_manager::ServiceManagerIsRemote()) {
       ash::wm::GetWindowState(popup_->GetNativeWindow())
           ->set_ignored_by_shelf(true);
     }
 #endif
     RepositionPopup();
   }
 }
 
 void StatusBubbleViews::Reposition() {
@@ skipping 271 matching lines @@
 void StatusBubbleViews::SetBubbleWidth(int width) {
   size_.set_width(width);
   SetBounds(original_position_.x(), original_position_.y(),
             size_.width(), size_.height());
 }
 
 void StatusBubbleViews::CancelExpandTimer() {
   if (expand_timer_factory_.HasWeakPtrs())
     expand_timer_factory_.InvalidateWeakPtrs();
 }