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

Side by Side Diff: athena/main/athena_launcher.cc

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/main/athena_frame_view.h ('k') | athena/main/athena_main.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 #include "athena/main/public/athena_launcher.h" 5 #include "athena/main/public/athena_launcher.h"
6 6
7 #include "athena/activity/public/activity_factory.h" 7 #include "athena/activity/public/activity_factory.h"
8 #include "athena/activity/public/activity_manager.h" 8 #include "athena/activity/public/activity_manager.h"
9 #include "athena/content/public/app_registry.h" 9 #include "athena/content/public/app_registry.h"
10 #include "athena/content/public/content_activity_factory_creator.h" 10 #include "athena/content/public/content_activity_factory_creator.h"
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
67 67
68 // This class observes the change of the virtual keyboard and distribute the 68 // This class observes the change of the virtual keyboard and distribute the
69 // change to appropriate modules of athena. 69 // change to appropriate modules of athena.
70 // TODO(oshima): move the VK bounds logic to screen manager. 70 // TODO(oshima): move the VK bounds logic to screen manager.
71 class VirtualKeyboardObserver : public keyboard::KeyboardControllerObserver { 71 class VirtualKeyboardObserver : public keyboard::KeyboardControllerObserver {
72 public: 72 public:
73 VirtualKeyboardObserver() { 73 VirtualKeyboardObserver() {
74 keyboard::KeyboardController::GetInstance()->AddObserver(this); 74 keyboard::KeyboardController::GetInstance()->AddObserver(this);
75 } 75 }
76 76
77 virtual ~VirtualKeyboardObserver() { 77 ~VirtualKeyboardObserver() override {
78 keyboard::KeyboardController::GetInstance()->RemoveObserver(this); 78 keyboard::KeyboardController::GetInstance()->RemoveObserver(this);
79 } 79 }
80 80
81 private: 81 private:
82 virtual void OnKeyboardBoundsChanging(const gfx::Rect& new_bounds) override { 82 virtual void OnKeyboardBoundsChanging(const gfx::Rect& new_bounds) override {
83 HomeCard::Get()->UpdateVirtualKeyboardBounds(new_bounds); 83 HomeCard::Get()->UpdateVirtualKeyboardBounds(new_bounds);
84 } 84 }
85 85
86 DISALLOW_COPY_AND_ASSIGN(VirtualKeyboardObserver); 86 DISALLOW_COPY_AND_ASSIGN(VirtualKeyboardObserver);
87 }; 87 };
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
169 athena::SystemUI::Shutdown(); 169 athena::SystemUI::Shutdown();
170 athena::WindowManager::Shutdown(); 170 athena::WindowManager::Shutdown();
171 athena::ScreenManager::Shutdown(); 171 athena::ScreenManager::Shutdown();
172 athena::InputManager::Shutdown(); 172 athena::InputManager::Shutdown();
173 athena::AthenaEnv::Shutdown(); 173 athena::AthenaEnv::Shutdown();
174 174
175 ShutdownAthenaViewsDelegate(); 175 ShutdownAthenaViewsDelegate();
176 } 176 }
177 177
178 } // namespace athena 178 } // namespace athena
OLDNEW
« no previous file with comments | « athena/main/athena_frame_view.h ('k') | athena/main/athena_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698