| Index: extensions/shell/browser/shell_desktop_controller.cc
|
| diff --git a/extensions/shell/browser/shell_desktop_controller.cc b/extensions/shell/browser/shell_desktop_controller.cc
|
| index 6e68087c22e409a2dd5936a9a45f6ebc3aa63fb5..59e84a57a016d71402c789ac5c00c47474ce1240 100644
|
| --- a/extensions/shell/browser/shell_desktop_controller.cc
|
| +++ b/extensions/shell/browser/shell_desktop_controller.cc
|
| @@ -52,9 +52,9 @@ class FillLayout : public aura::LayoutManager {
|
|
|
| private:
|
| // aura::LayoutManager:
|
| - virtual void OnWindowResized() OVERRIDE {}
|
| + virtual void OnWindowResized() override {}
|
|
|
| - virtual void OnWindowAddedToLayout(aura::Window* child) OVERRIDE {
|
| + virtual void OnWindowAddedToLayout(aura::Window* child) override {
|
| if (!child->parent())
|
| return;
|
|
|
| @@ -63,15 +63,15 @@ class FillLayout : public aura::LayoutManager {
|
| child->SetBounds(gfx::Rect(parent_size));
|
| }
|
|
|
| - virtual void OnWillRemoveWindowFromLayout(aura::Window* child) OVERRIDE {}
|
| + virtual void OnWillRemoveWindowFromLayout(aura::Window* child) override {}
|
|
|
| - virtual void OnWindowRemovedFromLayout(aura::Window* child) OVERRIDE {}
|
| + virtual void OnWindowRemovedFromLayout(aura::Window* child) override {}
|
|
|
| virtual void OnChildWindowVisibilityChanged(aura::Window* child,
|
| - bool visible) OVERRIDE {}
|
| + bool visible) override {}
|
|
|
| virtual void SetChildBounds(aura::Window* child,
|
| - const gfx::Rect& requested_bounds) OVERRIDE {
|
| + const gfx::Rect& requested_bounds) override {
|
| SetChildBoundsDirect(child, requested_bounds);
|
| }
|
|
|
| @@ -88,13 +88,13 @@ class ShellNativeCursorManager : public wm::NativeCursorManager {
|
|
|
| // wm::NativeCursorManager overrides.
|
| virtual void SetDisplay(const gfx::Display& display,
|
| - wm::NativeCursorManagerDelegate* delegate) OVERRIDE {
|
| + wm::NativeCursorManagerDelegate* delegate) override {
|
| if (image_cursors_->SetDisplay(display, display.device_scale_factor()))
|
| SetCursor(delegate->GetCursor(), delegate);
|
| }
|
|
|
| virtual void SetCursor(gfx::NativeCursor cursor,
|
| - wm::NativeCursorManagerDelegate* delegate) OVERRIDE {
|
| + wm::NativeCursorManagerDelegate* delegate) override {
|
| image_cursors_->SetPlatformCursor(&cursor);
|
| cursor.set_device_scale_factor(image_cursors_->GetScale());
|
| delegate->CommitCursor(cursor);
|
| @@ -105,7 +105,7 @@ class ShellNativeCursorManager : public wm::NativeCursorManager {
|
|
|
| virtual void SetVisibility(
|
| bool visible,
|
| - wm::NativeCursorManagerDelegate* delegate) OVERRIDE {
|
| + wm::NativeCursorManagerDelegate* delegate) override {
|
| delegate->CommitVisibility(visible);
|
|
|
| if (visible) {
|
| @@ -119,7 +119,7 @@ class ShellNativeCursorManager : public wm::NativeCursorManager {
|
|
|
| virtual void SetCursorSet(
|
| ui::CursorSetType cursor_set,
|
| - wm::NativeCursorManagerDelegate* delegate) OVERRIDE {
|
| + wm::NativeCursorManagerDelegate* delegate) override {
|
| image_cursors_->SetCursorSet(cursor_set);
|
| delegate->CommitCursorSet(cursor_set);
|
| if (delegate->IsCursorVisible())
|
| @@ -128,7 +128,7 @@ class ShellNativeCursorManager : public wm::NativeCursorManager {
|
|
|
| virtual void SetMouseEventsEnabled(
|
| bool enabled,
|
| - wm::NativeCursorManagerDelegate* delegate) OVERRIDE {
|
| + wm::NativeCursorManagerDelegate* delegate) override {
|
| delegate->CommitMouseEventsEnabled(enabled);
|
| SetVisibility(delegate->IsCursorVisible(), delegate);
|
| }
|
| @@ -149,7 +149,7 @@ class AppsFocusRules : public wm::BaseFocusRules {
|
| AppsFocusRules() {}
|
| virtual ~AppsFocusRules() {}
|
|
|
| - virtual bool SupportsChildActivation(aura::Window* window) const OVERRIDE {
|
| + virtual bool SupportsChildActivation(aura::Window* window) const override {
|
| return true;
|
| }
|
|
|
|
|