| OLD | NEW |
| 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 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 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) OVERRIDE; | 79 virtual void OnGestureEnded(HomeCard::State final_state, |
| 80 bool is_fling) OVERRIDE; |
| 80 virtual void OnGestureProgressed( | 81 virtual void OnGestureProgressed( |
| 81 HomeCard::State from_state, | 82 HomeCard::State from_state, |
| 82 HomeCard::State to_state, | 83 HomeCard::State to_state, |
| 83 float progress) OVERRIDE; | 84 float progress) OVERRIDE; |
| 84 | 85 |
| 85 // WindowManagerObserver: | 86 // WindowManagerObserver: |
| 86 virtual void OnOverviewModeEnter() OVERRIDE; | 87 virtual void OnOverviewModeEnter() OVERRIDE; |
| 87 virtual void OnOverviewModeExit() OVERRIDE; | 88 virtual void OnOverviewModeExit() OVERRIDE; |
| 88 virtual void OnSplitViewModeEnter() OVERRIDE; | 89 virtual void OnSplitViewModeEnter() OVERRIDE; |
| 89 virtual void OnSplitViewModeExit() OVERRIDE; | 90 virtual void OnSplitViewModeExit() OVERRIDE; |
| (...skipping 20 matching lines...) Expand all Loading... |
| 110 // Right now HomeCard allows only one search provider. | 111 // Right now HomeCard allows only one search provider. |
| 111 // TODO(mukai): port app-list's SearchController and Mixer. | 112 // TODO(mukai): port app-list's SearchController and Mixer. |
| 112 scoped_ptr<app_list::SearchProvider> search_provider_; | 113 scoped_ptr<app_list::SearchProvider> search_provider_; |
| 113 | 114 |
| 114 DISALLOW_COPY_AND_ASSIGN(HomeCardImpl); | 115 DISALLOW_COPY_AND_ASSIGN(HomeCardImpl); |
| 115 }; | 116 }; |
| 116 | 117 |
| 117 } // namespace athena | 118 } // namespace athena |
| 118 | 119 |
| 119 #endif // ATHENA_HOME_HOME_CARD_IMPL_H_ | 120 #endif // ATHENA_HOME_HOME_CARD_IMPL_H_ |
| OLD | NEW |