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

Side by Side Diff: ui/app_list/views/search_result_view.h

Issue 568383002: Ensure the app list search result progress bar is set in SetResult() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 UI_APP_LIST_VIEWS_SEARCH_RESULT_VIEW_H_ 5 #ifndef UI_APP_LIST_VIEWS_SEARCH_RESULT_VIEW_H_
6 #define UI_APP_LIST_VIEWS_SEARCH_RESULT_VIEW_H_ 6 #define UI_APP_LIST_VIEWS_SEARCH_RESULT_VIEW_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
11 #include "base/basictypes.h" 11 #include "base/basictypes.h"
12 #include "base/memory/scoped_ptr.h" 12 #include "base/memory/scoped_ptr.h"
13 #include "ui/app_list/search_result_observer.h" 13 #include "ui/app_list/search_result_observer.h"
14 #include "ui/app_list/views/search_result_actions_view_delegate.h" 14 #include "ui/app_list/views/search_result_actions_view_delegate.h"
15 #include "ui/views/context_menu_controller.h" 15 #include "ui/views/context_menu_controller.h"
16 #include "ui/views/controls/button/custom_button.h" 16 #include "ui/views/controls/button/custom_button.h"
17 17
18 namespace gfx { 18 namespace gfx {
19 class RenderText; 19 class RenderText;
20 } 20 }
21 21
22 namespace views { 22 namespace views {
23 class ImageButton; 23 class ImageButton;
24 class ImageView; 24 class ImageView;
25 class MenuRunner; 25 class MenuRunner;
26 } 26 }
27 27
28 namespace app_list { 28 namespace app_list {
29 namespace test {
30 class SearchResultListViewTest;
31 } // namespace test
29 32
30 class ProgressBarView; 33 class ProgressBarView;
31 class SearchResult; 34 class SearchResult;
32 class SearchResultListView; 35 class SearchResultListView;
33 class SearchResultViewDelegate; 36 class SearchResultViewDelegate;
34 class SearchResultActionsView; 37 class SearchResultActionsView;
35 38
36 // SearchResultView displays a SearchResult. 39 // SearchResultView displays a SearchResult.
37 class SearchResultView : public views::CustomButton, 40 class SearchResultView : public views::CustomButton,
38 public views::ButtonListener, 41 public views::ButtonListener,
(...skipping 11 matching lines...) Expand all
50 void SetResult(SearchResult* result); 53 void SetResult(SearchResult* result);
51 SearchResult* result() { return result_; } 54 SearchResult* result() { return result_; }
52 55
53 // Clears reference to SearchResult but don't schedule repaint. 56 // Clears reference to SearchResult but don't schedule repaint.
54 void ClearResultNoRepaint(); 57 void ClearResultNoRepaint();
55 58
56 // Clears the selected action. 59 // Clears the selected action.
57 void ClearSelectedAction(); 60 void ClearSelectedAction();
58 61
59 private: 62 private:
63 friend class app_list::test::SearchResultListViewTest;
64
60 void UpdateTitleText(); 65 void UpdateTitleText();
61 void UpdateDetailsText(); 66 void UpdateDetailsText();
62 67
63 // views::View overrides: 68 // views::View overrides:
64 virtual const char* GetClassName() const OVERRIDE; 69 virtual const char* GetClassName() const OVERRIDE;
65 virtual gfx::Size GetPreferredSize() const OVERRIDE; 70 virtual gfx::Size GetPreferredSize() const OVERRIDE;
66 virtual void Layout() OVERRIDE; 71 virtual void Layout() OVERRIDE;
67 virtual bool OnKeyPressed(const ui::KeyEvent& event) OVERRIDE; 72 virtual bool OnKeyPressed(const ui::KeyEvent& event) OVERRIDE;
68 virtual void ChildPreferredSizeChanged(views::View* child) OVERRIDE; 73 virtual void ChildPreferredSizeChanged(views::View* child) OVERRIDE;
69 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; 74 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
101 ProgressBarView* progress_bar_; // Owned by views hierarchy. 106 ProgressBarView* progress_bar_; // Owned by views hierarchy.
102 107
103 scoped_ptr<views::MenuRunner> context_menu_runner_; 108 scoped_ptr<views::MenuRunner> context_menu_runner_;
104 109
105 DISALLOW_COPY_AND_ASSIGN(SearchResultView); 110 DISALLOW_COPY_AND_ASSIGN(SearchResultView);
106 }; 111 };
107 112
108 } // namespace app_list 113 } // namespace app_list
109 114
110 #endif // UI_APP_LIST_VIEWS_SEARCH_RESULT_VIEW_H_ 115 #endif // UI_APP_LIST_VIEWS_SEARCH_RESULT_VIEW_H_
OLDNEW
« no previous file with comments | « ui/app_list/views/search_result_list_view_unittest.cc ('k') | ui/app_list/views/search_result_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698