X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fash%2Fsystem%2Fchromeos%2Ftray_tracing.cc;h=907b51bfd7ccd018c525039e80bf1f5cc96e27d8;hb=004985e17e624662a4c85c76a7654039dc83f028;hp=eddeac7fcfafb4a2fc64bf7ecd262e6376783731;hpb=2f108dbacb161091e42a3479f4e171339b7e7623;p=platform%2Fframework%2Fweb%2Fcrosswalk.git diff --git a/src/ash/system/chromeos/tray_tracing.cc b/src/ash/system/chromeos/tray_tracing.cc index eddeac7..907b51b 100644 --- a/src/ash/system/chromeos/tray_tracing.cc +++ b/src/ash/system/chromeos/tray_tracing.cc @@ -21,11 +21,9 @@ #include "ui/views/layout/box_layout.h" namespace ash { -namespace internal { - namespace tray { -class DefaultTracingView : public internal::ActionableView { +class DefaultTracingView : public ActionableView { public: DefaultTracingView() { SetLayoutManager(new views::BoxLayout( @@ -34,7 +32,7 @@ class DefaultTracingView : public internal::ActionableView { kTrayPopupPaddingBetweenItems)); ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance(); - image_ = new internal::FixedSizedImageView(0, kTrayPopupItemHeight); + image_ = new FixedSizedImageView(0, kTrayPopupItemHeight); image_->SetImage( bundle.GetImageNamed(IDR_AURA_UBER_TRAY_TRACING).ToImageSkia()); AddChildView(image_); @@ -64,7 +62,7 @@ class DefaultTracingView : public internal::ActionableView { } // namespace tray //////////////////////////////////////////////////////////////////////////////// -// ash::internal::TrayTracing +// ash::TrayTracing TrayTracing::TrayTracing(SystemTray* system_tray) : TrayImageItem(system_tray, IDR_AURA_UBER_TRAY_TRACING), @@ -109,5 +107,4 @@ void TrayTracing::OnTracingModeChanged(bool value) { SetTrayIconVisible(value); } -} // namespace internal } // namespace ash