ash/common/system/chromeos/network/tray_sms.cc - Issue 2671063002: Remove FixedSizedScrollView.

Side by Side Diff: ash/common/system/chromeos/network/tray_sms.cc

Issue 2671063002: Remove FixedSizedScrollView. (Closed)

Patch Set: rebase Created 3 years, 10 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:

« no previous file with comments | « ash/common/system/chromeos/network/network_state_list_detailed_view.cc ('k') | ash/common/system/tray/fixed_sized_scroll_view.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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/common/system/chromeos/network/tray_sms.h"	5 #include "ash/common/system/chromeos/network/tray_sms.h"

6	6

7 #include <utility>	7 #include <utility>

8	8

9 #include "ash/common/material_design/material_design_controller.h"	9 #include "ash/common/material_design/material_design_controller.h"

10 #include "ash/common/metrics/user_metrics_action.h"	10 #include "ash/common/metrics/user_metrics_action.h"

11 #include "ash/common/system/tray/fixed_sized_scroll_view.h"

12 #include "ash/common/system/tray/system_tray.h"	11 #include "ash/common/system/tray/system_tray.h"

13 #include "ash/common/system/tray/system_tray_bubble.h"	12 #include "ash/common/system/tray/system_tray_bubble.h"

14 #include "ash/common/system/tray/tray_constants.h"	13 #include "ash/common/system/tray/tray_constants.h"

15 #include "ash/common/system/tray/tray_details_view.h"	14 #include "ash/common/system/tray/tray_details_view.h"

16 #include "ash/common/system/tray/tray_item_more.h"	15 #include "ash/common/system/tray/tray_item_more.h"

17 #include "ash/common/system/tray/tray_item_view.h"	16 #include "ash/common/system/tray/tray_item_view.h"

18 #include "ash/common/system/tray/tray_notification_view.h"	17 #include "ash/common/system/tray/tray_notification_view.h"

19 #include "ash/common/wm_shell.h"	18 #include "ash/common/wm_shell.h"

20 #include "ash/resources/vector_icons/vector_icons.h"	19 #include "ash/resources/vector_icons/vector_icons.h"

21 #include "base/memory/ptr_util.h"	20 #include "base/memory/ptr_util.h"

22 #include "base/strings/string_number_conversions.h"	21 #include "base/strings/string_number_conversions.h"

23 #include "base/strings/utf_string_conversions.h"	22 #include "base/strings/utf_string_conversions.h"

24 #include "chromeos/network/network_event_log.h"	23 #include "chromeos/network/network_event_log.h"

25 #include "chromeos/network/network_handler.h"	24 #include "chromeos/network/network_handler.h"

26 #include "grit/ash_resources.h"	25 #include "grit/ash_resources.h"

27 #include "grit/ash_strings.h"	26 #include "grit/ash_strings.h"

28 #include "ui/base/l10n/l10n_util.h"	27 #include "ui/base/l10n/l10n_util.h"

29 #include "ui/base/resource/resource_bundle.h"	28 #include "ui/base/resource/resource_bundle.h"

30 #include "ui/gfx/paint_vector_icon.h"	29 #include "ui/gfx/paint_vector_icon.h"

31 #include "ui/views/bubble/tray_bubble_view.h"	30 #include "ui/views/bubble/tray_bubble_view.h"

32 #include "ui/views/controls/image_view.h"	31 #include "ui/views/controls/image_view.h"

33 #include "ui/views/controls/label.h"	32 #include "ui/views/controls/label.h"

	33 #include "ui/views/controls/scroll_view.h"

34 #include "ui/views/layout/box_layout.h"	34 #include "ui/views/layout/box_layout.h"

35 #include "ui/views/layout/fill_layout.h"	35 #include "ui/views/layout/fill_layout.h"

36 #include "ui/views/layout/grid_layout.h"	36 #include "ui/views/layout/grid_layout.h"

37 #include "ui/views/view.h"	37 #include "ui/views/view.h"

38	38

39 namespace {	39 namespace {

40	40

41 // Min height of the list of messages in the popup.	41 // Min height of the list of messages in the popup.

42 const int kMessageListMinHeight = 200;	42 const int kMessageListMinHeight = 200;

43 // Top/bottom padding of the text items.	43 // Top/bottom padding of the text items.

(...skipping 375 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
419 std::string number, text;	419 std::string number, text;

420 if (GetLatestMessage(&index, &number, &text))	420 if (GetLatestMessage(&index, &number, &text))

421 notification_->Update(index, number, text);	421 notification_->Update(index, number, text);

422 } else if (notify) {	422 } else if (notify) {

423 ShowNotificationView();	423 ShowNotificationView();

424 }	424 }

425 }	425 }

426 }	426 }

427	427

428 } // namespace ash	428 } // namespace ash

OLD	NEW