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

Side by Side Diff: athena/screen/screen_manager_impl.h

Issue 641683003: C++11 override style change for athena (Closed) Base URL: https://chromium.googlesource.com/chromium/src@master
Patch Set: rebase 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 | « athena/screen/screen_accelerator_handler.h ('k') | athena/screen/screen_manager_impl.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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 ATHENA_SCREEN_SCREEN_MANAGER_IMPL_H_ 5 #ifndef ATHENA_SCREEN_SCREEN_MANAGER_IMPL_H_
6 #define ATHENA_SCREEN_SCREEN_MANAGER_IMPL_H_ 6 #define ATHENA_SCREEN_SCREEN_MANAGER_IMPL_H_
7 7
8 #include "athena/athena_export.h" 8 #include "athena/athena_export.h"
9 #include "athena/screen/public/screen_manager.h" 9 #include "athena/screen/public/screen_manager.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 10 matching lines...) Expand all
21 class ScopedCaptureClient; 21 class ScopedCaptureClient;
22 } 22 }
23 23
24 namespace athena { 24 namespace athena {
25 class AcceleratorHandler; 25 class AcceleratorHandler;
26 26
27 class ATHENA_EXPORT ScreenManagerImpl : public ScreenManager, 27 class ATHENA_EXPORT ScreenManagerImpl : public ScreenManager,
28 public aura::client::WindowTreeClient { 28 public aura::client::WindowTreeClient {
29 public: 29 public:
30 explicit ScreenManagerImpl(aura::Window* root_window); 30 explicit ScreenManagerImpl(aura::Window* root_window);
31 virtual ~ScreenManagerImpl(); 31 ~ScreenManagerImpl() override;
32 32
33 void Init(); 33 void Init();
34 34
35 // Returns a container which has |priority|. Null if such container 35 // Returns a container which has |priority|. Null if such container
36 // doesn't exist. 36 // doesn't exist.
37 aura::Window* FindContainerByPriority(int priority); 37 aura::Window* FindContainerByPriority(int priority);
38 38
39 private: 39 private:
40 // ScreenManager: 40 // ScreenManager:
41 virtual aura::Window* CreateContainer(const ContainerParams& params) override; 41 virtual aura::Window* CreateContainer(const ContainerParams& params) override;
(...skipping 21 matching lines...) Expand all
63 63
64 gfx::Display::Rotation last_requested_rotation_; 64 gfx::Display::Rotation last_requested_rotation_;
65 bool rotation_locked_; 65 bool rotation_locked_;
66 66
67 DISALLOW_COPY_AND_ASSIGN(ScreenManagerImpl); 67 DISALLOW_COPY_AND_ASSIGN(ScreenManagerImpl);
68 }; 68 };
69 69
70 } // namespace athena 70 } // namespace athena
71 71
72 #endif // ATHENA_SCREEN_SCREEN_MANAGER_IMPL_H_ 72 #endif // ATHENA_SCREEN_SCREEN_MANAGER_IMPL_H_
OLDNEW
« no previous file with comments | « athena/screen/screen_accelerator_handler.h ('k') | athena/screen/screen_manager_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698