Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(263)

Unified Diff: ash/system/tray_update.cc

Issue 224113005: Eliminate ash::internal namespace (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 9 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/system/tray_update.h ('k') | ash/system/user/tray_user.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/tray_update.cc
diff --git a/ash/system/tray_update.cc b/ash/system/tray_update.cc
index e01dd97fcb2c9dd474b25073c089e5b5fc188a66..79a3ad6abefb430150298aa8be2500745b0b0f21 100644
--- a/ash/system/tray_update.cc
+++ b/ash/system/tray_update.cc
@@ -60,7 +60,7 @@ int DecideResource(ash::UpdateObserver::UpdateSeverity severity, bool dark) {
return 0;
}
-class UpdateView : public ash::internal::ActionableView {
+class UpdateView : public ash::ActionableView {
public:
explicit UpdateView(ash::UpdateObserver::UpdateSeverity severity) {
SetLayoutManager(new
@@ -70,7 +70,7 @@ class UpdateView : public ash::internal::ActionableView {
ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
views::ImageView* image =
- new ash::internal::FixedSizedImageView(0, ash::kTrayPopupItemHeight);
+ new ash::FixedSizedImageView(0, ash::kTrayPopupItemHeight);
image->SetImage(bundle.GetImageNamed(DecideResource(severity, true)).
ToImageSkia());
@@ -96,8 +96,6 @@ class UpdateView : public ash::internal::ActionableView {
}
namespace ash {
-namespace internal {
-
namespace tray {
class UpdateNagger : public ui::LayerAnimationObserver {
@@ -110,7 +108,7 @@ class UpdateNagger : public ui::LayerAnimationObserver {
}
virtual ~UpdateNagger() {
- internal::StatusAreaWidget* status_area =
+ StatusAreaWidget* status_area =
Shell::GetPrimaryRootWindowController()->shelf()->status_area_widget();
if (status_area) {
status_area->system_tray()->GetWidget()->GetNativeView()->layer()->
@@ -201,5 +199,4 @@ void TrayUpdate::OnUpdateRecommended(UpdateObserver::UpdateSeverity severity) {
}
}
-} // namespace internal
} // namespace ash
« no previous file with comments | « ash/system/tray_update.h ('k') | ash/system/user/tray_user.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698