| Index: ash/shell/widgets.cc
|
| diff --git a/ash/shell/widgets.cc b/ash/shell/widgets.cc
|
| index a302bd06c16cb4f4075f122b882f15a8369f70ec..9e5895a0fe32cb1762b1f5d284c81e4dbd312c84 100644
|
| --- a/ash/shell/widgets.cc
|
| +++ b/ash/shell/widgets.cc
|
| @@ -32,7 +32,7 @@ class WidgetsWindow : public views::WidgetDelegateView {
|
| // Overridden from views::View:
|
| void OnPaint(gfx::Canvas* canvas) override;
|
| void Layout() override;
|
| - gfx::Size GetPreferredSize() const override;
|
| + gfx::Size CalculatePreferredSize() const override;
|
|
|
| // Overridden from views::WidgetDelegate:
|
| base::string16 GetWindowTitle() const override;
|
| @@ -114,7 +114,7 @@ void WidgetsWindow::Layout() {
|
| }
|
| }
|
|
|
| -gfx::Size WidgetsWindow::GetPreferredSize() const {
|
| +gfx::Size WidgetsWindow::CalculatePreferredSize() const {
|
| return gfx::Size(kWindowWidth, kWindowHeight);
|
| }
|
|
|
|
|