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

Side by Side Diff: athena/home/home_card_impl.h

Issue 623103002: replace OVERRIDE and FINAL with override and final in athena/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master 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/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 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 56
57 aura::Window* GetHomeCardWindowForTest() const; 57 aura::Window* GetHomeCardWindowForTest() const;
58 58
59 private: 59 private:
60 enum Command { 60 enum Command {
61 COMMAND_SHOW_HOME_CARD, 61 COMMAND_SHOW_HOME_CARD,
62 }; 62 };
63 void InstallAccelerators(); 63 void InstallAccelerators();
64 64
65 // Overridden from HomeCard: 65 // Overridden from HomeCard:
66 virtual void SetState(HomeCard::State state) OVERRIDE; 66 virtual void SetState(HomeCard::State state) override;
67 virtual State GetState() OVERRIDE; 67 virtual State GetState() override;
68 virtual void RegisterSearchProvider( 68 virtual void RegisterSearchProvider(
69 app_list::SearchProvider* search_provider) OVERRIDE; 69 app_list::SearchProvider* search_provider) override;
70 virtual void UpdateVirtualKeyboardBounds( 70 virtual void UpdateVirtualKeyboardBounds(
71 const gfx::Rect& bounds) OVERRIDE; 71 const gfx::Rect& bounds) override;
72 72
73 // AcceleratorHandler: 73 // AcceleratorHandler:
74 virtual bool IsCommandEnabled(int command_id) const OVERRIDE; 74 virtual bool IsCommandEnabled(int command_id) const override;
75 virtual bool OnAcceleratorFired(int command_id, 75 virtual bool OnAcceleratorFired(int command_id,
76 const ui::Accelerator& accelerator) OVERRIDE; 76 const ui::Accelerator& accelerator) override;
77 77
78 // HomeCardGestureManager::Delegate: 78 // HomeCardGestureManager::Delegate:
79 virtual void OnGestureEnded(HomeCard::State final_state, 79 virtual void OnGestureEnded(HomeCard::State final_state,
80 bool is_fling) OVERRIDE; 80 bool is_fling) override;
81 virtual void OnGestureProgressed( 81 virtual void OnGestureProgressed(
82 HomeCard::State from_state, 82 HomeCard::State from_state,
83 HomeCard::State to_state, 83 HomeCard::State to_state,
84 float progress) OVERRIDE; 84 float progress) override;
85 85
86 // WindowManagerObserver: 86 // WindowManagerObserver:
87 virtual void OnOverviewModeEnter() OVERRIDE; 87 virtual void OnOverviewModeEnter() override;
88 virtual void OnOverviewModeExit() OVERRIDE; 88 virtual void OnOverviewModeExit() override;
89 virtual void OnSplitViewModeEnter() OVERRIDE; 89 virtual void OnSplitViewModeEnter() override;
90 virtual void OnSplitViewModeExit() OVERRIDE; 90 virtual void OnSplitViewModeExit() override;
91 91
92 // aura::client::ActivationChangeObserver: 92 // aura::client::ActivationChangeObserver:
93 virtual void OnWindowActivated(aura::Window* gained_active, 93 virtual void OnWindowActivated(aura::Window* gained_active,
94 aura::Window* lost_active) OVERRIDE; 94 aura::Window* lost_active) override;
95 95
96 scoped_ptr<AppModelBuilder> model_builder_; 96 scoped_ptr<AppModelBuilder> model_builder_;
97 97
98 HomeCard::State state_; 98 HomeCard::State state_;
99 99
100 // original_state_ is the state which the home card should go back to after 100 // original_state_ is the state which the home card should go back to after
101 // the virtual keyboard is hidden. 101 // the virtual keyboard is hidden.
102 HomeCard::State original_state_; 102 HomeCard::State original_state_;
103 103
104 views::Widget* home_card_widget_; 104 views::Widget* home_card_widget_;
105 HomeCardView* home_card_view_; 105 HomeCardView* home_card_view_;
106 scoped_ptr<AppListViewDelegate> view_delegate_; 106 scoped_ptr<AppListViewDelegate> view_delegate_;
107 HomeCardLayoutManager* layout_manager_; 107 HomeCardLayoutManager* layout_manager_;
108 aura::client::ActivationClient* activation_client_; // Not owned 108 aura::client::ActivationClient* activation_client_; // Not owned
109 scoped_ptr<ui::LayerOwner> minimized_home_; 109 scoped_ptr<ui::LayerOwner> minimized_home_;
110 110
111 // Right now HomeCard allows only one search provider. 111 // Right now HomeCard allows only one search provider.
112 // TODO(mukai): port app-list's SearchController and Mixer. 112 // TODO(mukai): port app-list's SearchController and Mixer.
113 scoped_ptr<app_list::SearchProvider> search_provider_; 113 scoped_ptr<app_list::SearchProvider> search_provider_;
114 114
115 DISALLOW_COPY_AND_ASSIGN(HomeCardImpl); 115 DISALLOW_COPY_AND_ASSIGN(HomeCardImpl);
116 }; 116 };
117 117
118 } // namespace athena 118 } // namespace athena
119 119
120 #endif // ATHENA_HOME_HOME_CARD_IMPL_H_ 120 #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