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

Side by Side Diff: athena/home/home_card_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, 1 month 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/home/home_card_gesture_manager_unittest.cc ('k') | athena/home/home_card_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_HOME_HOME_CARD_IMPL_H_ 5 #ifndef ATHENA_HOME_HOME_CARD_IMPL_H_
6 #define ATHENA_HOME_HOME_CARD_IMPL_H_ 6 #define ATHENA_HOME_HOME_CARD_IMPL_H_
7 7
8 #include "athena/athena_export.h" 8 #include "athena/athena_export.h"
9 #include "athena/home/home_card_gesture_manager.h" 9 #include "athena/home/home_card_gesture_manager.h"
10 #include "athena/home/public/home_card.h" 10 #include "athena/home/public/home_card.h"
(...skipping 23 matching lines...) Expand all
34 class HomeCardLayoutManager; 34 class HomeCardLayoutManager;
35 class HomeCardView; 35 class HomeCardView;
36 36
37 class ATHENA_EXPORT HomeCardImpl : public HomeCard, 37 class ATHENA_EXPORT HomeCardImpl : public HomeCard,
38 public AcceleratorHandler, 38 public AcceleratorHandler,
39 public HomeCardGestureManager::Delegate, 39 public HomeCardGestureManager::Delegate,
40 public WindowManagerObserver { 40 public WindowManagerObserver {
41 public: 41 public:
42 HomeCardImpl(scoped_ptr<AppModelBuilder> model_builder, 42 HomeCardImpl(scoped_ptr<AppModelBuilder> model_builder,
43 scoped_ptr<SearchControllerFactory> search_factory); 43 scoped_ptr<SearchControllerFactory> search_factory);
44 virtual ~HomeCardImpl(); 44 ~HomeCardImpl() override;
45 45
46 void Init(); 46 void Init();
47 47
48 aura::Window* GetHomeCardWindowForTest() const; 48 aura::Window* GetHomeCardWindowForTest() const;
49 49
50 private: 50 private:
51 enum Command { 51 enum Command {
52 COMMAND_SHOW_HOME_CARD, 52 COMMAND_SHOW_HOME_CARD,
53 }; 53 };
54 void InstallAccelerators(); 54 void InstallAccelerators();
55 55
56 // Overridden from HomeCard: 56 // Overridden from HomeCard:
57 virtual void SetState(HomeCard::State state) override; 57 void SetState(HomeCard::State state) override;
58 virtual State GetState() override; 58 State GetState() override;
59 virtual void UpdateVirtualKeyboardBounds( 59 void UpdateVirtualKeyboardBounds(const gfx::Rect& bounds) override;
60 const gfx::Rect& bounds) override;
61 60
62 // AcceleratorHandler: 61 // AcceleratorHandler:
63 virtual bool IsCommandEnabled(int command_id) const override; 62 bool IsCommandEnabled(int command_id) const override;
64 virtual bool OnAcceleratorFired(int command_id, 63 bool OnAcceleratorFired(int command_id,
65 const ui::Accelerator& accelerator) override; 64 const ui::Accelerator& accelerator) override;
66 65
67 // HomeCardGestureManager::Delegate: 66 // HomeCardGestureManager::Delegate:
68 virtual void OnGestureEnded(HomeCard::State final_state, 67 void OnGestureEnded(HomeCard::State final_state, bool is_fling) override;
69 bool is_fling) override; 68 void OnGestureProgressed(HomeCard::State from_state,
70 virtual void OnGestureProgressed( 69 HomeCard::State to_state,
71 HomeCard::State from_state, 70 float progress) override;
72 HomeCard::State to_state,
73 float progress) override;
74 71
75 // WindowManagerObserver: 72 // WindowManagerObserver:
76 virtual void OnOverviewModeEnter() override; 73 void OnOverviewModeEnter() override;
77 virtual void OnOverviewModeExit() override; 74 void OnOverviewModeExit() override;
78 virtual void OnSplitViewModeEnter() override; 75 void OnSplitViewModeEnter() override;
79 virtual void OnSplitViewModeExit() override; 76 void OnSplitViewModeExit() override;
80 77
81 scoped_ptr<AppModelBuilder> model_builder_; 78 scoped_ptr<AppModelBuilder> model_builder_;
82 scoped_ptr<SearchControllerFactory> search_factory_; 79 scoped_ptr<SearchControllerFactory> search_factory_;
83 80
84 HomeCard::State state_; 81 HomeCard::State state_;
85 82
86 // original_state_ is the state which the home card should go back to after 83 // original_state_ is the state which the home card should go back to after
87 // the virtual keyboard is hidden. 84 // the virtual keyboard is hidden.
88 HomeCard::State original_state_; 85 HomeCard::State original_state_;
89 86
90 views::Widget* home_card_widget_; 87 views::Widget* home_card_widget_;
91 HomeCardView* home_card_view_; 88 HomeCardView* home_card_view_;
92 scoped_ptr<AppListViewDelegate> view_delegate_; 89 scoped_ptr<AppListViewDelegate> view_delegate_;
93 HomeCardLayoutManager* layout_manager_; 90 HomeCardLayoutManager* layout_manager_;
94 scoped_ptr<ui::LayerOwner> minimized_home_; 91 scoped_ptr<ui::LayerOwner> minimized_home_;
95 92
96 DISALLOW_COPY_AND_ASSIGN(HomeCardImpl); 93 DISALLOW_COPY_AND_ASSIGN(HomeCardImpl);
97 }; 94 };
98 95
99 } // namespace athena 96 } // namespace athena
100 97
101 #endif // ATHENA_HOME_HOME_CARD_IMPL_H_ 98 #endif // ATHENA_HOME_HOME_CARD_IMPL_H_
OLDNEW
« no previous file with comments | « athena/home/home_card_gesture_manager_unittest.cc ('k') | athena/home/home_card_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698