WebUI: Change DOMUI to WebUI in two chromeos classes.

chrome/browser/chromeos/views/menu_locator.cc

-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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/chromeos/views/menu_locator.h"
 
 #include "base/i18n/rtl.h"
 #include "base/logging.h"
-#include "chrome/browser/chromeos/views/domui_menu_widget.h"
+#include "chrome/browser/chromeos/views/webui_menu_widget.h"
 #include "gfx/point.h"
 #include "gfx/rect.h"
 #include "gfx/insets.h"
 #include "views/screen.h"
 #include "views/widget/widget.h"
 
 namespace {
 
-using chromeos::DOMUIMenuWidget;
+using chromeos::WebUIMenuWidget;
 
 // Menu's corner radious.
 const int kMenuCornerRadius = 0;  // crosbug.com/7718.
 const int kSubmenuOverlapPx = 1;
 
 gfx::Rect GetBoundsOf(const views::Widget* widget) {
   gfx::Rect bounds;
   widget->GetBounds(&bounds, false);
   return bounds;
 }
 
 // Returns the Rect of the screen that contains the point (x, y).
 gfx::Rect GetScreenRectAt(int x, int y) {
   return views::Screen::GetMonitorAreaNearestPoint(gfx::Point(x, y));
 }
 
 // Returns adjusted height of the menu that fits to the screen's
 // hight, and enables scrolling if necessary.

[Avi (use Gerrit), 2011/02/03 15:09:05]

fix spelling of height

[tfarina, 2011/02/03 16:37:49]

Done.

-int AdjustHeight(DOMUIMenuWidget* widget,
+int AdjustHeight(WebUIMenuWidget* widget,
                  int screen_height,
                  int height) {
   // TODO(oshima): Locator needs a preferred size so that
   // 1) we can tell height == screen_rect is the result of
   //    locator resizing it, or preferred size happens to be
   //    same hight of the screen (which is rare).
   // 2) when the menu is moved to place where it has more space, it can
   //    hide the scrollbar again. (which won't happen on chromeos now)
   if (height >= screen_height) {
     widget->EnableScroll(true);
     return screen_height;
   }
   widget->EnableScroll(false);
   return height;
 }
 
 // Updates the root menu's bounds to fit to the screen.
-void UpdateRootMenuBounds(DOMUIMenuWidget* widget,
+void UpdateRootMenuBounds(WebUIMenuWidget* widget,
                           const gfx::Point& origin,
                           const gfx::Size& size,
                           bool align_right) {
   gfx::Rect screen_rect = GetScreenRectAt(origin.x(), origin.y());
   int width = std::min(screen_rect.width(), size.width());
   int height = AdjustHeight(widget, screen_rect.height(), size.height());
 
   int x = align_right ? origin.x() - width : origin.x();
   int y = origin.y();
   if (x + width > screen_rect.right())
     x = screen_rect.right() - width;
   if (y + height > screen_rect.bottom())
     y = screen_rect.bottom() - height;
   widget->SetBounds(gfx::Rect(x, y, width, height));
 }
 
 // MenuLocator for dropdown menu.
 class DropDownMenuLocator : public chromeos::MenuLocator {
  public:
   explicit DropDownMenuLocator(const gfx::Point& origin)
       : origin_(origin) {
   }
 
  private:
   virtual SubmenuDirection GetSubmenuDirection() const {
     return DEFAULT;
   }
 
-  virtual void Move(DOMUIMenuWidget* widget) {
+  virtual void Move(WebUIMenuWidget* widget) {
     // TODO(oshima):
     // Dropdown Menu has to be shown above the button, which is not currently
     // possible with Menu2. I'll update Menu2 and this code
     // after beta.
     gfx::Rect bounds;
     widget->GetBounds(&bounds, false);
     UpdateRootMenuBounds(widget, origin_, bounds.size(), !base::i18n::IsRTL());
   }
 
-  virtual void SetBounds(DOMUIMenuWidget* widget, const gfx::Size& size) {
+  virtual void SetBounds(WebUIMenuWidget* widget, const gfx::Size& size) {
     gfx::Size new_size(size);
     new_size.Enlarge(0, kMenuCornerRadius);
     UpdateRootMenuBounds(widget, origin_, size, !base::i18n::IsRTL());
   }
 
   virtual void GetInsets(gfx::Insets* insets) const {
     insets->Set(0, 0, kMenuCornerRadius, 0);
   }
 
   virtual const SkScalar* GetCorners() const {
@@ skipping 16 matching lines @@
  public:
   explicit ContextMenuLocator(const gfx::Point& origin)
       : origin_(origin) {
   }
 
  private:
   virtual SubmenuDirection GetSubmenuDirection() const {
     return DEFAULT;
   }
 
-  virtual void Move(DOMUIMenuWidget* widget) {
+  virtual void Move(WebUIMenuWidget* widget) {
     gfx::Rect bounds;
     widget->GetBounds(&bounds, false);
     UpdateRootMenuBounds(widget, origin_, bounds.size(), base::i18n::IsRTL());
   }
 
-  virtual void SetBounds(DOMUIMenuWidget* widget, const gfx::Size& size) {
+  virtual void SetBounds(WebUIMenuWidget* widget, const gfx::Size& size) {
     gfx::Size new_size(size);
     new_size.Enlarge(0, kMenuCornerRadius * 2);
     UpdateRootMenuBounds(widget, origin_, new_size, base::i18n::IsRTL());
   }
 
   virtual const SkScalar* GetCorners() const {
     static const SkScalar corners[] = {
       kMenuCornerRadius, kMenuCornerRadius,
       kMenuCornerRadius, kMenuCornerRadius,
       kMenuCornerRadius, kMenuCornerRadius,
       kMenuCornerRadius, kMenuCornerRadius,
     };
     return corners;
   }
 
   virtual void GetInsets(gfx::Insets* insets) const {
     insets->Set(kMenuCornerRadius, 0, kMenuCornerRadius, 0);
   }
 
   gfx::Point origin_;
 
   DISALLOW_COPY_AND_ASSIGN(ContextMenuLocator);
 };
 
 // MenuLocator for submenu.
 class SubMenuLocator : public chromeos::MenuLocator {
  public:
-  SubMenuLocator(const DOMUIMenuWidget* parent,
+  SubMenuLocator(const WebUIMenuWidget* parent,
                  MenuLocator::SubmenuDirection parent_direction,
                  int y)
       : parent_rect_(GetBoundsOf(parent)),
         parent_direction_(parent_direction),
         root_y_(parent_rect_.y() + y),
         corners_(NULL),
         direction_(DEFAULT) {
   }
 
  private:
   virtual SubmenuDirection GetSubmenuDirection() const {
     return direction_;
   }
 
-  virtual void Move(DOMUIMenuWidget* widget) {
+  virtual void Move(WebUIMenuWidget* widget) {
     gfx::Rect bounds;
     widget->GetBounds(&bounds, false);
     UpdateBounds(widget, bounds.size());
   }
 
-  virtual void SetBounds(DOMUIMenuWidget* widget, const gfx::Size& size) {
+  virtual void SetBounds(WebUIMenuWidget* widget, const gfx::Size& size) {
     gfx::Size new_size(size);
     new_size.Enlarge(0, kMenuCornerRadius * 2);
     UpdateBounds(widget, new_size);
   }
 
   virtual const SkScalar* GetCorners() const {
     return corners_;
   }
 
   virtual void GetInsets(gfx::Insets* insets) const {
     insets->Set(kMenuCornerRadius, 0, kMenuCornerRadius, 0);
   }
 
   // Rounded corner definitions for right/left attached submenu.
   static const SkScalar kRightCorners[];
   static const SkScalar kLeftCorners[];
 
-  void UpdateBounds(DOMUIMenuWidget* widget, const gfx::Size& size) {
+  void UpdateBounds(WebUIMenuWidget* widget, const gfx::Size& size) {
     gfx::Rect screen_rect = GetScreenRectAt(parent_rect_.x(), root_y_);
     int width = std::min(screen_rect.width(), size.width());
     int height = AdjustHeight(widget, size.height(), screen_rect.height());
 
     SubmenuDirection direction = parent_direction_;
     if (direction == DEFAULT) {
       if (base::i18n::IsRTL()) {
         direction = LEFT;
       } else {
         direction = RIGHT;
@@ skipping 87 matching lines @@
 // static
 MenuLocator* MenuLocator::CreateDropDownMenuLocator(const gfx::Point& p) {
   return new DropDownMenuLocator(p);
 }
 
 MenuLocator* MenuLocator::CreateContextMenuLocator(const gfx::Point& p) {
   return new ContextMenuLocator(p);
 }
 
 MenuLocator* MenuLocator::CreateSubMenuLocator(
-    const DOMUIMenuWidget* parent,
+    const WebUIMenuWidget* parent,
     MenuLocator::SubmenuDirection parent_direction,
     int y) {
   return new SubMenuLocator(parent, parent_direction, y);
 }
 
 }  // namespace chromeos