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/metrics/user_metrics_recorder.h" | 9 #include "ash/metrics/user_metrics_recorder.h" |
10 #include "ash/shell.h" | 10 #include "ash/shell.h" |
(...skipping 337 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
348 // Close the details if there is really nothing to show there anymore. | 348 // Close the details if there is really nothing to show there anymore. |
349 if (new_set.empty() && GetWidget()) | 349 if (new_set.empty() && GetWidget()) |
350 GetWidget()->Close(); | 350 GetWidget()->Close(); |
351 } | 351 } |
352 | 352 |
353 void AppendSettings() { | 353 void AppendSettings() { |
354 if (settings_) | 354 if (settings_) |
355 return; | 355 return; |
356 | 356 |
357 HoverHighlightView* container = new HoverHighlightView(this); | 357 HoverHighlightView* container = new HoverHighlightView(this); |
358 container->AddLabel(ui::ResourceBundle::GetSharedInstance(). | 358 container->AddLabel( |
359 GetLocalizedString(IDS_ASH_STATUS_TRAY_DRIVE_SETTINGS), | 359 ui::ResourceBundle::GetSharedInstance().GetLocalizedString( |
| 360 IDS_ASH_STATUS_TRAY_DRIVE_SETTINGS), |
| 361 gfx::ALIGN_LEFT, |
360 gfx::Font::NORMAL); | 362 gfx::Font::NORMAL); |
361 AddChildView(container); | 363 AddChildView(container); |
362 settings_ = container; | 364 settings_ = container; |
363 } | 365 } |
364 | 366 |
365 // Overridden from ViewClickListener. | 367 // Overridden from ViewClickListener. |
366 virtual void OnViewClicked(views::View* sender) OVERRIDE { | 368 virtual void OnViewClicked(views::View* sender) OVERRIDE { |
367 SystemTrayDelegate* delegate = Shell::GetInstance()->system_tray_delegate(); | 369 SystemTrayDelegate* delegate = Shell::GetInstance()->system_tray_delegate(); |
368 if (sender == footer()->content()) { | 370 if (sender == footer()->content()) { |
369 TransitionToDefaultView(); | 371 TransitionToDefaultView(); |
(...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
506 DriveOperationStatusList empty_list; | 508 DriveOperationStatusList empty_list; |
507 | 509 |
508 tray_view()->SetVisible(false); | 510 tray_view()->SetVisible(false); |
509 if (default_) | 511 if (default_) |
510 default_->Update(&empty_list); | 512 default_->Update(&empty_list); |
511 if (detailed_) | 513 if (detailed_) |
512 detailed_->Update(&empty_list); | 514 detailed_->Update(&empty_list); |
513 } | 515 } |
514 | 516 |
515 } // namespace ash | 517 } // namespace ash |
OLD | NEW |