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

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

Issue 463403003: Remove custom layout from app list SearchBoxView (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | ui/app_list/views/search_box_view.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 (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_BOX_VIEW_H_ 5 #ifndef UI_APP_LIST_VIEWS_SEARCH_BOX_VIEW_H_
6 #define UI_APP_LIST_VIEWS_SEARCH_BOX_VIEW_H_ 6 #define UI_APP_LIST_VIEWS_SEARCH_BOX_VIEW_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "ui/app_list/search_box_model_observer.h" 10 #include "ui/app_list/search_box_model_observer.h"
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 void InvalidateMenu(); 49 void InvalidateMenu();
50 50
51 views::Textfield* search_box() { return search_box_; } 51 views::Textfield* search_box() { return search_box_; }
52 52
53 void set_contents_view(views::View* contents_view) { 53 void set_contents_view(views::View* contents_view) {
54 contents_view_ = contents_view; 54 contents_view_ = contents_view;
55 } 55 }
56 56
57 // Overridden from views::View: 57 // Overridden from views::View:
58 virtual gfx::Size GetPreferredSize() const OVERRIDE; 58 virtual gfx::Size GetPreferredSize() const OVERRIDE;
59 virtual void Layout() OVERRIDE;
60 virtual bool OnMouseWheel(const ui::MouseWheelEvent& event) OVERRIDE; 59 virtual bool OnMouseWheel(const ui::MouseWheelEvent& event) OVERRIDE;
61 60
62 private: 61 private:
63 // Updates model text and selection model with current Textfield info. 62 // Updates model text and selection model with current Textfield info.
64 void UpdateModel(); 63 void UpdateModel();
65 64
66 // Fires query change notification. 65 // Fires query change notification.
67 void NotifyQueryChanged(); 66 void NotifyQueryChanged();
68 67
69 // Overridden from views::TextfieldController: 68 // Overridden from views::TextfieldController:
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
102 views::MenuButton* menu_button_; // Owned by views hierarchy. 101 views::MenuButton* menu_button_; // Owned by views hierarchy.
103 views::Textfield* search_box_; // Owned by views hierarchy. 102 views::Textfield* search_box_; // Owned by views hierarchy.
104 views::View* contents_view_; // Owned by views hierarchy. 103 views::View* contents_view_; // Owned by views hierarchy.
105 104
106 DISALLOW_COPY_AND_ASSIGN(SearchBoxView); 105 DISALLOW_COPY_AND_ASSIGN(SearchBoxView);
107 }; 106 };
108 107
109 } // namespace app_list 108 } // namespace app_list
110 109
111 #endif // UI_APP_LIST_VIEWS_SEARCH_BOX_VIEW_H_ 110 #endif // UI_APP_LIST_VIEWS_SEARCH_BOX_VIEW_H_
OLDNEW
« no previous file with comments | « no previous file | ui/app_list/views/search_box_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698