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

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

Issue 397343003: Introduce centered view and bottom view for home card. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix Created 6 years, 5 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
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/minimized_home.h" 5 #include "athena/home/minimized_home.h"
6 6
7 #include "ui/views/background.h" 7 #include "ui/views/background.h"
8 #include "ui/views/layout/box_layout.h" 8 #include "ui/views/layout/box_layout.h"
9 #include "ui/views/view.h" 9 #include "ui/views/view.h"
10 #include "ui/views/widget/widget.h" 10 #include "ui/views/widget/widget.h"
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 athena::MinimizedHomeDragDelegate* delegate_; 69 athena::MinimizedHomeDragDelegate* delegate_;
70 SkColor color_; 70 SkColor color_;
71 71
72 DISALLOW_COPY_AND_ASSIGN(MinimizedHomeView); 72 DISALLOW_COPY_AND_ASSIGN(MinimizedHomeView);
73 }; 73 };
74 74
75 } // namespace 75 } // namespace
76 76
77 namespace athena { 77 namespace athena {
78 78
79 views::Widget* CreateMinimizedHome(aura::Window* container, 79 views::View* CreateMinimizedHome(MinimizedHomeDragDelegate* delegate) {
80 MinimizedHomeDragDelegate* delegate) {
81 views::Widget* widget = new views::Widget;
82 views::Widget::InitParams params(
83 views::Widget::InitParams::TYPE_WINDOW_FRAMELESS);
84 params.parent = container;
85 params.delegate = NULL;
86 widget->Init(params);
87
88 views::View* content_view = new views::View; 80 views::View* content_view = new views::View;
89 widget->SetContentsView(content_view); 81 content_view->set_background(
82 views::Background::CreateSolidBackground(SK_ColorBLACK));
90 views::BoxLayout* layout = 83 views::BoxLayout* layout =
91 new views::BoxLayout(views::BoxLayout::kHorizontal, 0, 2, 0); 84 new views::BoxLayout(views::BoxLayout::kHorizontal, 0, 2, 0);
92 layout->set_main_axis_alignment(views::BoxLayout::MAIN_AXIS_ALIGNMENT_CENTER); 85 layout->set_main_axis_alignment(views::BoxLayout::MAIN_AXIS_ALIGNMENT_CENTER);
93 content_view->SetLayoutManager(layout); 86 content_view->SetLayoutManager(layout);
94 87
95 views::View* view = new MinimizedHomeView(delegate); 88 views::View* view = new MinimizedHomeView(delegate);
96 content_view->AddChildView(view); 89 content_view->AddChildView(view);
97 return widget; 90 return content_view;
98 } 91 }
99 92
100 } // namespace athena 93 } // namespace athena
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698