Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(237)

Side by Side Diff: ash/shell.h

Issue 621133002: replace OVERRIDE and FINAL with override and final in ash/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « ash/shelf/shelf_window_watcher_unittest.cc ('k') | ash/shell.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef ASH_SHELL_H_ 5 #ifndef ASH_SHELL_H_
6 #define ASH_SHELL_H_ 6 #define ASH_SHELL_H_
7 7
8 #include <utility> 8 #include <utility>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 582 matching lines...) Expand 10 before | Expand all | Expand 10 after
593 593
594 void Init(const ShellInitParams& init_params); 594 void Init(const ShellInitParams& init_params);
595 595
596 // Initializes virtual keyboard controller. 596 // Initializes virtual keyboard controller.
597 void InitKeyboard(); 597 void InitKeyboard();
598 598
599 // Initializes the root window so that it can host browser windows. 599 // Initializes the root window so that it can host browser windows.
600 void InitRootWindow(aura::Window* root_window); 600 void InitRootWindow(aura::Window* root_window);
601 601
602 // ash::SystemModalContainerEventFilterDelegate overrides: 602 // ash::SystemModalContainerEventFilterDelegate overrides:
603 virtual bool CanWindowReceiveEvents(aura::Window* window) OVERRIDE; 603 virtual bool CanWindowReceiveEvents(aura::Window* window) override;
604 604
605 // Overridden from ui::EventTarget: 605 // Overridden from ui::EventTarget:
606 virtual bool CanAcceptEvent(const ui::Event& event) OVERRIDE; 606 virtual bool CanAcceptEvent(const ui::Event& event) override;
607 virtual EventTarget* GetParentTarget() OVERRIDE; 607 virtual EventTarget* GetParentTarget() override;
608 virtual scoped_ptr<ui::EventTargetIterator> GetChildIterator() const OVERRIDE; 608 virtual scoped_ptr<ui::EventTargetIterator> GetChildIterator() const override;
609 virtual ui::EventTargeter* GetEventTargeter() OVERRIDE; 609 virtual ui::EventTargeter* GetEventTargeter() override;
610 virtual void OnEvent(ui::Event* event) OVERRIDE; 610 virtual void OnEvent(ui::Event* event) override;
611 611
612 // Overridden from aura::client::ActivationChangeObserver: 612 // Overridden from aura::client::ActivationChangeObserver:
613 virtual void OnWindowActivated(aura::Window* gained_active, 613 virtual void OnWindowActivated(aura::Window* gained_active,
614 aura::Window* lost_active) OVERRIDE; 614 aura::Window* lost_active) override;
615 615
616 static Shell* instance_; 616 static Shell* instance_;
617 617
618 // If set before the Shell is initialized, the mouse cursor will be hidden 618 // If set before the Shell is initialized, the mouse cursor will be hidden
619 // when the screen is initially created. 619 // when the screen is initially created.
620 static bool initially_hide_cursor_; 620 static bool initially_hide_cursor_;
621 621
622 // When no explicit target display/RootWindow is given, new windows are 622 // When no explicit target display/RootWindow is given, new windows are
623 // created on |scoped_target_root_window_| , unless NULL in 623 // created on |scoped_target_root_window_| , unless NULL in
624 // which case they are created on |target_root_window_|. 624 // which case they are created on |target_root_window_|.
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after
759 759
760 // Injected content::GPUDataManager support. 760 // Injected content::GPUDataManager support.
761 scoped_ptr<GPUSupport> gpu_support_; 761 scoped_ptr<GPUSupport> gpu_support_;
762 762
763 DISALLOW_COPY_AND_ASSIGN(Shell); 763 DISALLOW_COPY_AND_ASSIGN(Shell);
764 }; 764 };
765 765
766 } // namespace ash 766 } // namespace ash
767 767
768 #endif // ASH_SHELL_H_ 768 #endif // ASH_SHELL_H_
OLDNEW
« no previous file with comments | « ash/shelf/shelf_window_watcher_unittest.cc ('k') | ash/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698