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/drive/tray_drive.h" | 5 #include "ash/system/drive/tray_drive.h" |
6 | 6 |
7 #include <vector> | 7 #include <vector> |
8 | 8 |
9 #include "ash/shell.h" | 9 #include "ash/shell.h" |
10 #include "ash/system/tray/system_tray.h" | 10 #include "ash/system/tray/system_tray.h" |
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
155 label_container_->SetLayoutManager(new views::BoxLayout( | 155 label_container_->SetLayoutManager(new views::BoxLayout( |
156 views::BoxLayout::kVertical, 0, 0, kVerticalPadding)); | 156 views::BoxLayout::kVertical, 0, 0, kVerticalPadding)); |
157 #if defined(OS_POSIX) | 157 #if defined(OS_POSIX) |
158 string16 file_label = | 158 string16 file_label = |
159 UTF8ToUTF16(file_path.BaseName().value()); | 159 UTF8ToUTF16(file_path.BaseName().value()); |
160 #elif defined(OS_WIN) | 160 #elif defined(OS_WIN) |
161 string16 file_label = | 161 string16 file_label = |
162 WideToUTF16(file_path.BaseName().value()); | 162 WideToUTF16(file_path.BaseName().value()); |
163 #endif | 163 #endif |
164 views::Label* label = new views::Label(file_label); | 164 views::Label* label = new views::Label(file_label); |
165 label->SetHorizontalAlignment(views::Label::ALIGN_LEFT); | 165 label->SetHorizontalAlignment(gfx::ALIGN_LEFT); |
166 label_container_->AddChildView(label); | 166 label_container_->AddChildView(label); |
167 // Add progress bar. | 167 // Add progress bar. |
168 progress_bar_ = new OperationProgressBar(); | 168 progress_bar_ = new OperationProgressBar(); |
169 label_container_->AddChildView(progress_bar_); | 169 label_container_->AddChildView(progress_bar_); |
170 | 170 |
171 AddChildView(label_container_); | 171 AddChildView(label_container_); |
172 | 172 |
173 cancel_button_ = new views::ImageButton(this); | 173 cancel_button_ = new views::ImageButton(this); |
174 cancel_button_->SetImage(views::ImageButton::BS_NORMAL, | 174 cancel_button_->SetImage(views::ImageButton::BS_NORMAL, |
175 ResourceBundle::GetSharedInstance().GetImageSkiaNamed( | 175 ResourceBundle::GetSharedInstance().GetImageSkiaNamed( |
(...skipping 263 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
439 | 439 |
440 if (default_) | 440 if (default_) |
441 default_->Update(&list); | 441 default_->Update(&list); |
442 | 442 |
443 if (detailed_) | 443 if (detailed_) |
444 detailed_->Update(&list); | 444 detailed_->Update(&list); |
445 } | 445 } |
446 | 446 |
447 } // namespace internal | 447 } // namespace internal |
448 } // namespace ash | 448 } // namespace ash |
OLD | NEW |