diff options
| author | mukai <mukai@chromium.org> | 2014-11-06 23:20:52 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-11-07 07:21:09 +0000 |
| commit | 2cfb364757f832c665682fccea04675eb716693b (patch) | |
| tree | 46ddcf8c6ac7f3e67730380445ed910d36b3ff1b /athena | |
| parent | 3f7b06baf1ecf6a7016dc01217f5699b4312aaf4 (diff) | |
| download | chromium_src-2cfb364757f832c665682fccea04675eb716693b.zip chromium_src-2cfb364757f832c665682fccea04675eb716693b.tar.gz chromium_src-2cfb364757f832c665682fccea04675eb716693b.tar.bz2 | |
Fixes minor style issues which was in r303001
BUG=425717, 425724, 425719
TBR=oshima@chromium.org
TEST=none
Review URL: https://codereview.chromium.org/700333004
Cr-Commit-Position: refs/heads/master@{#303204}
Diffstat (limited to 'athena')
| -rw-r--r-- | athena/home/app_list_view_delegate.cc | 2 | ||||
| -rw-r--r-- | athena/home/home_card_impl.cc | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/athena/home/app_list_view_delegate.cc b/athena/home/app_list_view_delegate.cc index 06d0bdc8..270aae6 100644 --- a/athena/home/app_list_view_delegate.cc +++ b/athena/home/app_list_view_delegate.cc @@ -140,7 +140,7 @@ void AppListViewDelegate::ShowForProfileByPath( views::View* AppListViewDelegate::CreateStartPageWebView( const gfx::Size& size) { - return NULL; + return nullptr; } std::vector<views::View*> AppListViewDelegate::CreateCustomPageWebViews( diff --git a/athena/home/home_card_impl.cc b/athena/home/home_card_impl.cc index c0603d2..e9f468a 100644 --- a/athena/home/home_card_impl.cc +++ b/athena/home/home_card_impl.cc @@ -169,7 +169,9 @@ class HomeCardView : public views::WidgetDelegateView { } void Init() { - main_view_->Init(GetWidget()->GetNativeView(), -1, search_box_view_); + main_view_->Init(GetWidget()->GetNativeView(), + -1, /* inital apps page: -1 means default */ + search_box_view_); } void SetStateProgress(HomeCard::State from_state, @@ -419,6 +421,9 @@ void HomeCardImpl::Init() { widget_params.delegate = home_card_view_; widget_params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW; home_card_widget_->Init(widget_params); + // AppListMainView in home card may move outside of home card layer partially + // in an transition animation. This flag is set to clip the parts outside of + // home card. home_card_widget_->GetNativeWindow()->layer()->SetMasksToBounds(true); home_card_view_->Init(); |