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

Side by Side Diff: athena/home/athena_start_page_view.cc

Issue 653563004: NULL -> nullptr under athena/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src@master
Patch Set: Created 6 years, 2 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
« no previous file with comments | « athena/extensions/test/test_extensions_delegate.cc ('k') | athena/home/home_card_impl.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 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 #include "athena/home/athena_start_page_view.h" 5 #include "athena/home/athena_start_page_view.h"
6 6
7 #include "athena/home/home_card_constants.h" 7 #include "athena/home/home_card_constants.h"
8 #include "athena/system/public/system_ui.h" 8 #include "athena/system/public/system_ui.h"
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/strings/string_util.h" 10 #include "base/strings/string_util.h"
(...skipping 177 matching lines...) Expand 10 before | Expand all | Expand 10 after
188 system_info_view_->SetFillsBoundsOpaquely(false); 188 system_info_view_->SetFillsBoundsOpaquely(false);
189 AddChildView(system_info_view_); 189 AddChildView(system_info_view_);
190 190
191 logo_ = view_delegate->CreateStartPageWebView( 191 logo_ = view_delegate->CreateStartPageWebView(
192 gfx::Size(kWebViewWidth, kWebViewHeight)); 192 gfx::Size(kWebViewWidth, kWebViewHeight));
193 logo_->SetPaintToLayer(true); 193 logo_->SetPaintToLayer(true);
194 logo_->SetFillsBoundsOpaquely(false); 194 logo_->SetFillsBoundsOpaquely(false);
195 logo_->SetSize(gfx::Size(kWebViewWidth, kWebViewHeight)); 195 logo_->SetSize(gfx::Size(kWebViewWidth, kWebViewHeight));
196 AddChildView(logo_); 196 AddChildView(logo_);
197 197
198 search_results_view_ = new app_list::SearchResultListView( 198 search_results_view_ =
199 NULL, view_delegate); 199 new app_list::SearchResultListView(nullptr, view_delegate);
200 // search_results_view_'s size will shrink after settings results. 200 // search_results_view_'s size will shrink after settings results.
201 search_results_height_ = static_cast<views::View*>( 201 search_results_height_ = static_cast<views::View*>(
202 search_results_view_)->GetHeightForWidth(kSearchBoxWidth); 202 search_results_view_)->GetHeightForWidth(kSearchBoxWidth);
203 search_results_view_->SetResults(view_delegate->GetModel()->results()); 203 search_results_view_->SetResults(view_delegate->GetModel()->results());
204 204
205 search_results_view_->SetVisible(false); 205 search_results_view_->SetVisible(false);
206 search_results_view_->SetPaintToLayer(true); 206 search_results_view_->SetPaintToLayer(true);
207 search_results_view_->SetFillsBoundsOpaquely(false); 207 search_results_view_->SetFillsBoundsOpaquely(false);
208 AddChildView(search_results_view_); 208 AddChildView(search_results_view_);
209 209
(...skipping 276 matching lines...) Expand 10 before | Expand all | Expand 10 after
486 app_list::AppListItem* item) { 486 app_list::AppListItem* item) {
487 UpdateAppIcons(); 487 UpdateAppIcons();
488 } 488 }
489 489
490 // static 490 // static
491 size_t AthenaStartPageView::GetMaxIconNumForTest() { 491 size_t AthenaStartPageView::GetMaxIconNumForTest() {
492 return kMaxIconNum; 492 return kMaxIconNum;
493 } 493 }
494 494
495 } // namespace athena 495 } // namespace athena
OLDNEW
« no previous file with comments | « athena/extensions/test/test_extensions_delegate.cc ('k') | athena/home/home_card_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698