Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 #include "ui/app_list/views/app_list_main_view.h" | 5 #include "ui/app_list/views/app_list_main_view.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 | 8 |
| 9 #include "base/callback.h" | 9 #include "base/callback.h" |
| 10 #include "base/files/file_path.h" | 10 #include "base/files/file_path.h" |
| (...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 83 search_box_view_(NULL), | 83 search_box_view_(NULL), |
| 84 contents_view_(NULL) { | 84 contents_view_(NULL) { |
| 85 // Starts icon loading early. | 85 // Starts icon loading early. |
| 86 PreloadIcons(pagination_model, anchor); | 86 PreloadIcons(pagination_model, anchor); |
| 87 | 87 |
| 88 SetLayoutManager(new views::BoxLayout(views::BoxLayout::kVertical, | 88 SetLayoutManager(new views::BoxLayout(views::BoxLayout::kVertical, |
| 89 kInnerPadding, | 89 kInnerPadding, |
| 90 kInnerPadding, | 90 kInnerPadding, |
| 91 kInnerPadding)); | 91 kInnerPadding)); |
| 92 | 92 |
| 93 search_box_view_ = new SearchBoxView(this, delegate); | 93 search_box_view_ = new SearchBoxView(this); |
|
benwells
2013/07/23 01:10:43
Should you update the menu here?
tapted
2013/07/23 01:16:47
I was doing this in patchset 1, but realised it wo
benwells
2013/07/23 01:23:26
I'd prefer not to have distant parts of the code r
| |
| 94 AddChildView(search_box_view_); | 94 AddChildView(search_box_view_); |
| 95 | 95 |
| 96 contents_view_ = new ContentsView(this, pagination_model); | 96 contents_view_ = new ContentsView(this, pagination_model); |
| 97 AddChildView(contents_view_); | 97 AddChildView(contents_view_); |
| 98 | 98 |
| 99 search_box_view_->set_contents_view(contents_view_); | 99 search_box_view_->set_contents_view(contents_view_); |
| 100 | 100 |
| 101 #if defined(USE_AURA) | 101 #if defined(USE_AURA) |
| 102 contents_view_->SetPaintToLayer(true); | 102 contents_view_->SetPaintToLayer(true); |
| 103 contents_view_->SetFillsBoundsOpaquely(false); | 103 contents_view_->SetFillsBoundsOpaquely(false); |
| (...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 220 } | 220 } |
| 221 | 221 |
| 222 void AppListMainView::InvokeResultAction(SearchResult* result, | 222 void AppListMainView::InvokeResultAction(SearchResult* result, |
| 223 int action_index, | 223 int action_index, |
| 224 int event_flags) { | 224 int event_flags) { |
| 225 if (delegate_) | 225 if (delegate_) |
| 226 delegate_->InvokeSearchResultAction(result, action_index, event_flags); | 226 delegate_->InvokeSearchResultAction(result, action_index, event_flags); |
| 227 } | 227 } |
| 228 | 228 |
| 229 } // namespace app_list | 229 } // namespace app_list |
| OLD | NEW |