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/tray/tray_views.h" | 5 #include "ash/system/tray/tray_views.h" |
6 | 6 |
7 #include "ash/system/tray/tray_constants.h" | 7 #include "ash/system/tray/tray_constants.h" |
8 #include "ash/system/tray/tray_item_view.h" | 8 #include "ash/system/tray/tray_item_view.h" |
9 #include "grit/ash_strings.h" | 9 #include "grit/ash_strings.h" |
10 #include "grit/ui_resources.h" | 10 #include "grit/ui_resources.h" |
(...skipping 11 matching lines...) Expand all Loading... |
22 #include "ui/views/painter.h" | 22 #include "ui/views/painter.h" |
23 | 23 |
24 namespace ash { | 24 namespace ash { |
25 namespace internal { | 25 namespace internal { |
26 | 26 |
27 namespace { | 27 namespace { |
28 const int kIconPaddingLeft = 5; | 28 const int kIconPaddingLeft = 5; |
29 const int kPaddingAroundButtons = 5; | 29 const int kPaddingAroundButtons = 5; |
30 | 30 |
31 const int kBarImagesActive[] = { | 31 const int kBarImagesActive[] = { |
32 IDR_AURA_UBER_TRAY_BAR_BUTTON_ACTIVE_LEFT, | 32 IDR_SLIDER_ACTIVE_LEFT, |
33 IDR_AURA_UBER_TRAY_BAR_BUTTON_ACTIVE_CENTER, | 33 IDR_SLIDER_ACTIVE_CENTER, |
34 IDR_AURA_UBER_TRAY_BAR_BUTTON_ACTIVE_RIGHT, | 34 IDR_SLIDER_ACTIVE_RIGHT, |
35 }; | 35 }; |
36 | 36 |
37 const int kBarImagesDisabled[] = { | 37 const int kBarImagesDisabled[] = { |
38 IDR_AURA_UBER_TRAY_BAR_BUTTON_DISABLED_LEFT, | 38 IDR_SLIDER_DISABLED_LEFT, |
39 IDR_AURA_UBER_TRAY_BAR_BUTTON_DISABLED_CENTER, | 39 IDR_SLIDER_DISABLED_CENTER, |
40 IDR_AURA_UBER_TRAY_BAR_BUTTON_DISABLED_RIGHT, | 40 IDR_SLIDER_DISABLED_RIGHT, |
41 }; | 41 }; |
42 | 42 |
43 views::View* CreatePopupHeaderButtonsContainer() { | 43 views::View* CreatePopupHeaderButtonsContainer() { |
44 views::View* view = new views::View; | 44 views::View* view = new views::View; |
45 view->SetLayoutManager(new | 45 view->SetLayoutManager(new |
46 views::BoxLayout(views::BoxLayout::kHorizontal, 0, 0, -1)); | 46 views::BoxLayout(views::BoxLayout::kHorizontal, 0, 0, -1)); |
47 view->set_border(views::Border::CreateEmptyBorder(0, 0, 0, 5)); | 47 view->set_border(views::Border::CreateEmptyBorder(0, 0, 0, 5)); |
48 return view; | 48 return view; |
49 } | 49 } |
50 | 50 |
(...skipping 595 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
646 tray_view->set_border(views::Border::CreateEmptyBorder( | 646 tray_view->set_border(views::Border::CreateEmptyBorder( |
647 kTrayLabelItemVerticalPaddingVeriticalAlignment, | 647 kTrayLabelItemVerticalPaddingVeriticalAlignment, |
648 horizontal_padding, | 648 horizontal_padding, |
649 kTrayLabelItemVerticalPaddingVeriticalAlignment, | 649 kTrayLabelItemVerticalPaddingVeriticalAlignment, |
650 horizontal_padding)); | 650 horizontal_padding)); |
651 } | 651 } |
652 } | 652 } |
653 | 653 |
654 } // namespace internal | 654 } // namespace internal |
655 } // namespace ash | 655 } // namespace ash |
OLD | NEW |