Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 #include "ui/app_list/views/contents_view.h" | 5 #include "ui/app_list/views/contents_view.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "base/logging.h" | 10 #include "base/logging.h" |
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 49 std::vector<views::View*> custom_page_views = | 49 std::vector<views::View*> custom_page_views = |
| 50 view_delegate->CreateCustomPageWebViews(GetLocalBounds().size()); | 50 view_delegate->CreateCustomPageWebViews(GetLocalBounds().size()); |
| 51 for (std::vector<views::View*>::const_iterator it = | 51 for (std::vector<views::View*>::const_iterator it = |
| 52 custom_page_views.begin(); | 52 custom_page_views.begin(); |
| 53 it != custom_page_views.end(); | 53 it != custom_page_views.end(); |
| 54 ++it) { | 54 ++it) { |
| 55 AddLauncherPage(*it, IDR_APP_LIST_NOTIFICATIONS_ICON); | 55 AddLauncherPage(*it, IDR_APP_LIST_NOTIFICATIONS_ICON); |
| 56 } | 56 } |
| 57 | 57 |
| 58 start_page_view_ = new StartPageView(app_list_main_view_, view_delegate); | 58 start_page_view_ = new StartPageView(app_list_main_view_, view_delegate); |
| 59 AddLauncherPage(start_page_view_, 0, NAMED_PAGE_START); | 59 AddLauncherPage( |
| 60 start_page_view_, IDR_APP_LIST_SEARCH_ICON, NAMED_PAGE_START); | |
|
calamity
2014/09/09 09:15:15
I don't think this is git cl formatted.
calamity
2014/09/09 09:16:50
Disregard.
Matt Giuca
2014/09/09 23:45:43
Acknowledged.
| |
| 60 } else { | 61 } else { |
| 61 search_results_view_ = | 62 search_results_view_ = |
| 62 new SearchResultListView(app_list_main_view_, view_delegate); | 63 new SearchResultListView(app_list_main_view_, view_delegate); |
| 63 AddLauncherPage(search_results_view_, 0, NAMED_PAGE_SEARCH_RESULTS); | 64 AddLauncherPage(search_results_view_, 0, NAMED_PAGE_SEARCH_RESULTS); |
| 64 search_results_view_->SetResults(model->results()); | 65 search_results_view_->SetResults(model->results()); |
| 65 } | 66 } |
| 66 | 67 |
| 67 apps_container_view_ = new AppsContainerView(app_list_main_view_, model); | 68 apps_container_view_ = new AppsContainerView(app_list_main_view_, model); |
| 68 | 69 |
| 69 AddLauncherPage( | 70 AddLauncherPage( |
| (...skipping 229 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 299 } | 300 } |
| 300 | 301 |
| 301 void ContentsView::TransitionStarted() { | 302 void ContentsView::TransitionStarted() { |
| 302 } | 303 } |
| 303 | 304 |
| 304 void ContentsView::TransitionChanged() { | 305 void ContentsView::TransitionChanged() { |
| 305 UpdatePageBounds(); | 306 UpdatePageBounds(); |
| 306 } | 307 } |
| 307 | 308 |
| 308 } // namespace app_list | 309 } // namespace app_list |
| OLD | NEW |