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

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

Issue 601333002: ESC accelerator and consistent overview mode for Athena homecard (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 | « no previous file | athena/home/home_card_impl.cc » ('j') | athena/home/home_card_impl.cc » ('J')
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 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 54
55 void Init(); 55 void Init();
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 void SetStateAndOverview(HomeCard::State state);
64 65
65 // Overridden from HomeCard: 66 // Overridden from HomeCard:
66 virtual void SetState(HomeCard::State state) OVERRIDE; 67 virtual void SetState(HomeCard::State state) OVERRIDE;
67 virtual State GetState() OVERRIDE; 68 virtual State GetState() OVERRIDE;
68 virtual void RegisterSearchProvider( 69 virtual void RegisterSearchProvider(
69 app_list::SearchProvider* search_provider) OVERRIDE; 70 app_list::SearchProvider* search_provider) OVERRIDE;
70 virtual void UpdateVirtualKeyboardBounds( 71 virtual void UpdateVirtualKeyboardBounds(
71 const gfx::Rect& bounds) OVERRIDE; 72 const gfx::Rect& bounds) OVERRIDE;
72 73
73 // AcceleratorHandler: 74 // AcceleratorHandler:
(...skipping 19 matching lines...) Expand all
93 virtual void OnWindowActivated(aura::Window* gained_active, 94 virtual void OnWindowActivated(aura::Window* gained_active,
94 aura::Window* lost_active) OVERRIDE; 95 aura::Window* lost_active) OVERRIDE;
95 96
96 scoped_ptr<AppModelBuilder> model_builder_; 97 scoped_ptr<AppModelBuilder> model_builder_;
97 98
98 HomeCard::State state_; 99 HomeCard::State state_;
99 100
100 // original_state_ is the state which the home card should go back to after 101 // original_state_ is the state which the home card should go back to after
101 // the virtual keyboard is hidden. 102 // the virtual keyboard is hidden.
102 HomeCard::State original_state_; 103 HomeCard::State original_state_;
104 // state to set when overview mode enters or exits
105 HomeCard::State overview_state_;
103 106
104 views::Widget* home_card_widget_; 107 views::Widget* home_card_widget_;
105 HomeCardView* home_card_view_; 108 HomeCardView* home_card_view_;
106 scoped_ptr<AppListViewDelegate> view_delegate_; 109 scoped_ptr<AppListViewDelegate> view_delegate_;
107 HomeCardLayoutManager* layout_manager_; 110 HomeCardLayoutManager* layout_manager_;
108 aura::client::ActivationClient* activation_client_; // Not owned 111 aura::client::ActivationClient* activation_client_; // Not owned
109 scoped_ptr<ui::LayerOwner> minimized_home_; 112 scoped_ptr<ui::LayerOwner> minimized_home_;
110 113
111 // Right now HomeCard allows only one search provider. 114 // Right now HomeCard allows only one search provider.
112 // TODO(mukai): port app-list's SearchController and Mixer. 115 // TODO(mukai): port app-list's SearchController and Mixer.
113 scoped_ptr<app_list::SearchProvider> search_provider_; 116 scoped_ptr<app_list::SearchProvider> search_provider_;
114 117
115 DISALLOW_COPY_AND_ASSIGN(HomeCardImpl); 118 DISALLOW_COPY_AND_ASSIGN(HomeCardImpl);
116 }; 119 };
117 120
118 } // namespace athena 121 } // namespace athena
119 122
120 #endif // ATHENA_HOME_HOME_CARD_IMPL_H_ 123 #endif // ATHENA_HOME_HOME_CARD_IMPL_H_
OLDNEW
« no previous file with comments | « no previous file | athena/home/home_card_impl.cc » ('j') | athena/home/home_card_impl.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698