ash/mash: Introduce a ShelfDelegate implementation for mash.

ash/screen_util.cc

 // Copyright 2014 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 "ash/screen_util.h"
 
 #include "ash/display/display_manager.h"
 #include "ash/root_window_controller.h"
 #include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shelf/shelf_widget.h"
@@ skipping 47 matching lines @@
     // In unified desktop mode, there is only one shelf in the 1st display.
     const gfx::Display& first =
         display_manager->software_mirroring_display_list()[0];
     float scale =
         static_cast<float>(window->GetRootWindow()->bounds().height()) /
         first.size().height();
     gfx::SizeF size(first.size());
     size.Scale(scale, scale);
     return gfx::Rect(gfx::ToCeiledSize(size));
   } else {
+    if (window->GetRootWindow()->bounds().IsEmpty()) {
+      // TODO(sad): This only happens when running with mustash, since the
+      // root-window here refers to the shelf Widget, which has not been
+      // sized/positioned yet. Use the bounds of the display in this case.

[msw, 2016/02/09 18:31:26]

Could this always use the display bounds? When are they different?

[sadrul, 2016/02/10 08:04:41]

Looks like it could always use the display bounds (at least, the trybots aren't
complaining: https://codereview.chromium.org/1688453002/). However, it doesn't
work right for mustash if we always use the display size. I haven't looked
closely enough to figure out why. But ideally, as sky@ notes below, we wouldn't
be running this code for mustash at all.

+      gfx::Display display =

[sky, 2016/02/09 20:44:08]

We shouldn't be calling this code right? I think it best to add a NOTIMPLEMENTED
or warning that we need to fix this.

[sadrul, 2016/02/10 08:04:41]

Added a NOTIMPLEMENTED() here. We do still need this temporary workaround to get
the shelf to show up on screen at the right position though, so I kept that
part.

+          gfx::Screen::GetScreen()->GetDisplayNearestWindow(window);
+      return gfx::Rect(display.size());
+    }
     return window->GetRootWindow()->bounds();
   }
 }
 
 // static
 gfx::Rect ScreenUtil::ConvertRectToScreen(aura::Window* window,
                                          const gfx::Rect& rect) {
   gfx::Point point = rect.origin();
   aura::client::GetScreenPositionClient(window->GetRootWindow())->
       ConvertPointToScreen(window, &point);
@@ skipping 13 matching lines @@
 const gfx::Display& ScreenUtil::GetSecondaryDisplay() {
   DisplayManager* display_manager = GetDisplayManager();
   CHECK_LE(2U, display_manager->GetNumDisplays());
   return display_manager->GetDisplayAt(0).id() ==
                  gfx::Screen::GetScreen()->GetPrimaryDisplay().id()
              ? display_manager->GetDisplayAt(1)
              : display_manager->GetDisplayAt(0);
 }
 
 }  // namespace ash