Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / ui / views / frame / browser_view_layout.h

diff --git a/src/chrome/browser/ui/views/frame/browser_view_layout.h b/src/chrome/browser/ui/views/frame/browser_view_layout.h
index 3bc9143..5902a90 100644 (file)
--- a/src/chrome/browser/ui/views/frame/browser_view_layout.h
+++ b/src/chrome/browser/ui/views/frame/browser_view_layout.h
@@ -42,7 +42,7 @@ class BrowserViewLayout : public views::LayoutManager {
   static const int kToolbarTabStripVerticalOverlap;
 
   BrowserViewLayout();
-  virtual ~BrowserViewLayout();
+  ~BrowserViewLayout() override;
 
   // Sets all the views to be managed. Takes ownership of |delegate|.
   // |browser_view| may be NULL in tests.
@@ -83,8 +83,8 @@ class BrowserViewLayout : public views::LayoutManager {
   int NonClientHitTest(const gfx::Point& point);
 
   // views::LayoutManager overrides:
-  virtual void Layout(views::View* host) OVERRIDE;
-  virtual gfx::Size GetPreferredSize(views::View* host) OVERRIDE;
+  void Layout(views::View* host) override;
+  gfx::Size GetPreferredSize(const views::View* host) const override;
 
  private:
   FRIEND_TEST_ALL_PREFIXES(BrowserViewLayoutTest, BrowserViewLayout);