| Index: content/shell/browser/shell_platform_data_aura.cc
|
| diff --git a/content/shell/browser/shell_platform_data_aura.cc b/content/shell/browser/shell_platform_data_aura.cc
|
| index b30abc04b31d889ac9d7caf3ca5be2ea305bef98..d1ac37950390a6bb4a5af1e08e2edce2cfb62883 100644
|
| --- a/content/shell/browser/shell_platform_data_aura.cc
|
| +++ b/content/shell/browser/shell_platform_data_aura.cc
|
| @@ -29,29 +29,25 @@ class FillLayout : public aura::LayoutManager {
|
| : root_(root) {
|
| }
|
|
|
| - virtual ~FillLayout() {}
|
| + ~FillLayout() override {}
|
|
|
| private:
|
| // aura::LayoutManager:
|
| - virtual void OnWindowResized() override {
|
| - }
|
| + void OnWindowResized() override {}
|
|
|
| - virtual void OnWindowAddedToLayout(aura::Window* child) override {
|
| + void OnWindowAddedToLayout(aura::Window* child) override {
|
| child->SetBounds(root_->bounds());
|
| }
|
|
|
| - virtual void OnWillRemoveWindowFromLayout(aura::Window* child) override {
|
| - }
|
| + void OnWillRemoveWindowFromLayout(aura::Window* child) override {}
|
|
|
| - virtual void OnWindowRemovedFromLayout(aura::Window* child) override {
|
| - }
|
| + void OnWindowRemovedFromLayout(aura::Window* child) override {}
|
|
|
| - virtual void OnChildWindowVisibilityChanged(aura::Window* child,
|
| - bool visible) override {
|
| - }
|
| + void OnChildWindowVisibilityChanged(aura::Window* child,
|
| + bool visible) override {}
|
|
|
| - virtual void SetChildBounds(aura::Window* child,
|
| - const gfx::Rect& requested_bounds) override {
|
| + void SetChildBounds(aura::Window* child,
|
| + const gfx::Rect& requested_bounds) override {
|
| SetChildBoundsDirect(child, requested_bounds);
|
| }
|
|
|
| @@ -73,7 +69,7 @@ class MinimalInputEventFilter : public ui::internal::InputMethodDelegate,
|
| input_method_.get());
|
| }
|
|
|
| - virtual ~MinimalInputEventFilter() {
|
| + ~MinimalInputEventFilter() override {
|
| host_->window()->RemovePreTargetHandler(this);
|
| host_->window()->SetProperty(aura::client::kRootWindowInputMethodKey,
|
| static_cast<ui::InputMethod*>(NULL));
|
| @@ -81,7 +77,7 @@ class MinimalInputEventFilter : public ui::internal::InputMethodDelegate,
|
|
|
| private:
|
| // ui::EventHandler:
|
| - virtual void OnKeyEvent(ui::KeyEvent* event) override {
|
| + void OnKeyEvent(ui::KeyEvent* event) override {
|
| // See the comment in InputMethodEventFilter::OnKeyEvent() for details.
|
| if (event->IsTranslated()) {
|
| event->SetTranslated(false);
|
| @@ -92,7 +88,7 @@ class MinimalInputEventFilter : public ui::internal::InputMethodDelegate,
|
| }
|
|
|
| // ui::internal::InputMethodDelegate:
|
| - virtual bool DispatchKeyEventPostIME(const ui::KeyEvent& event) override {
|
| + bool DispatchKeyEventPostIME(const ui::KeyEvent& event) override {
|
| // See the comment in InputMethodEventFilter::DispatchKeyEventPostIME() for
|
| // details.
|
| ui::KeyEvent aura_event(event);
|
|
|