| 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_ATHENA_START_PAGE_VIEW_H_ | 5 #ifndef ATHENA_HOME_ATHENA_START_PAGE_VIEW_H_ | 
| 6 #define ATHENA_HOME_ATHENA_START_PAGE_VIEW_H_ | 6 #define ATHENA_HOME_ATHENA_START_PAGE_VIEW_H_ | 
| 7 | 7 | 
| 8 #include "athena/athena_export.h" | 8 #include "athena/athena_export.h" | 
| 9 #include "base/memory/weak_ptr.h" | 9 #include "base/memory/weak_ptr.h" | 
| 10 #include "ui/app_list/views/search_box_view_delegate.h" | 10 #include "ui/app_list/views/search_box_view_delegate.h" | 
| (...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 62 | 62 | 
| 63   // Schedules the animation for the layout the search box and the search | 63   // Schedules the animation for the layout the search box and the search | 
| 64   // results. | 64   // results. | 
| 65   void LayoutSearchResults(bool should_show_search_results); | 65   void LayoutSearchResults(bool should_show_search_results); | 
| 66 | 66 | 
| 67   // Called when the animation of search box / search results layout has | 67   // Called when the animation of search box / search results layout has | 
| 68   // completed. | 68   // completed. | 
| 69   void OnSearchResultLayoutAnimationCompleted(bool should_show_search_results); | 69   void OnSearchResultLayoutAnimationCompleted(bool should_show_search_results); | 
| 70 | 70 | 
| 71   // views::View: | 71   // views::View: | 
| 72   virtual void Layout() OVERRIDE; | 72   virtual void Layout() override; | 
| 73   virtual bool OnKeyPressed(const ui::KeyEvent& key_event) OVERRIDE; | 73   virtual bool OnKeyPressed(const ui::KeyEvent& key_event) override; | 
| 74 | 74 | 
| 75   // app_list::SearchBoxViewDelegate: | 75   // app_list::SearchBoxViewDelegate: | 
| 76   virtual void QueryChanged(app_list::SearchBoxView* sender) OVERRIDE; | 76   virtual void QueryChanged(app_list::SearchBoxView* sender) override; | 
| 77 | 77 | 
| 78   // Not owned. | 78   // Not owned. | 
| 79   app_list::AppListViewDelegate* delegate_; | 79   app_list::AppListViewDelegate* delegate_; | 
| 80 | 80 | 
| 81   // Views are owned through its hierarchy. | 81   // Views are owned through its hierarchy. | 
| 82   views::View* system_info_view_; | 82   views::View* system_info_view_; | 
| 83   views::View* app_icon_container_; | 83   views::View* app_icon_container_; | 
| 84   views::View* search_box_container_; | 84   views::View* search_box_container_; | 
| 85   views::View* control_icon_container_; | 85   views::View* control_icon_container_; | 
| 86   views::View* logo_; | 86   views::View* logo_; | 
| (...skipping 12 matching lines...) Expand all  Loading... | 
| 99   float layout_state_; | 99   float layout_state_; | 
| 100 | 100 | 
| 101   base::WeakPtrFactory<AthenaStartPageView> weak_factory_; | 101   base::WeakPtrFactory<AthenaStartPageView> weak_factory_; | 
| 102 | 102 | 
| 103   DISALLOW_COPY_AND_ASSIGN(AthenaStartPageView); | 103   DISALLOW_COPY_AND_ASSIGN(AthenaStartPageView); | 
| 104 }; | 104 }; | 
| 105 | 105 | 
| 106 }  // namespace athena | 106 }  // namespace athena | 
| 107 | 107 | 
| 108 #endif  // ATHENA_HOME_ATHENA_START_PAGE_VIEW_H_ | 108 #endif  // ATHENA_HOME_ATHENA_START_PAGE_VIEW_H_ | 
| OLD | NEW | 
|---|