ash/system/status_area_widget.cc - Issue 10514008: Add WebNotificationTray

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: ash/system/status_area_widget.cc

Issue 10514008: Add WebNotificationTray (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix test (don't mirror bubble arrow) Created 8 years, 6 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

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 "ash/system/status_area_widget.h"	5 #include "ash/system/status_area_widget.h"

6	6

7 #include "ash/shell.h"	7 #include "ash/shell.h"

8 #include "ash/shell_window_ids.h"	8 #include "ash/shell_window_ids.h"

9 #include "ash/system/status_area_widget_delegate.h"	9 #include "ash/system/status_area_widget_delegate.h"

10 #include "ui/aura/window.h"	10 #include "ui/aura/window.h"

(...skipping 13 matching lines...) Expand all Loading...
24 Init(params);	24 Init(params);

25 set_focus_on_creation(false);	25 set_focus_on_creation(false);

26 SetContentsView(widget_delegate_);	26 SetContentsView(widget_delegate_);

27 GetNativeView()->SetName("StatusAreaWidget");	27 GetNativeView()->SetName("StatusAreaWidget");

28 }	28 }

29	29

30 StatusAreaWidget::~StatusAreaWidget() {	30 StatusAreaWidget::~StatusAreaWidget() {

31 }	31 }

32	32

33 void StatusAreaWidget::AddTray(views::View* tray) {	33 void StatusAreaWidget::AddTray(views::View* tray) {

34 widget_delegate_->AddChildView(tray);	34 widget_delegate_->AddTray(tray);

35 widget_delegate_->Layout();

36 }	35 }

37	36

38 void StatusAreaWidget::SetShelfAlignment(ShelfAlignment alignment) {	37 void StatusAreaWidget::SetShelfAlignment(ShelfAlignment alignment) {

39 if (alignment == SHELF_ALIGNMENT_BOTTOM)	38 widget_delegate_->set_alignment(alignment);

40 widget_delegate_->SetLayout(views::BoxLayout::kHorizontal);	39 widget_delegate_->UpdateLayout();

41 else

42 widget_delegate_->SetLayout(views::BoxLayout::kVertical);

43 }	40 }

44	41

45 } // namespace internal	42 } // namespace internal

46 } // namespace ash	43 } // namespace ash

OLD	NEW

« no previous file with comments | « ash/shell/window_type_launcher.cc ('k') | ash/system/status_area_widget_delegate.h » ('j') | ash/system/tray/system_tray_bubble.h » ('J')