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

Unified Diff: ash/system/chromeos/tray_display.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/chromeos/tray_display.h ('k') | ash/system/chromeos/tray_display_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/chromeos/tray_display.cc
diff --git a/ash/system/chromeos/tray_display.cc b/ash/system/chromeos/tray_display.cc
index 8b627b722d9f82e1491e9647683c9c5ac56ea0fa..b5814c1304f39c7bdc5835b17bd001905e128155 100644
--- a/ash/system/chromeos/tray_display.cc
+++ b/ash/system/chromeos/tray_display.cc
@@ -31,7 +31,6 @@
using message_center::Notification;
namespace ash {
-namespace internal {
namespace {
DisplayManager* GetDisplayManager() {
@@ -130,7 +129,7 @@ void OpenSettings() {
const char TrayDisplay::kNotificationId[] = "chrome://settings/display";
-class DisplayView : public internal::ActionableView {
+class DisplayView : public ActionableView {
public:
explicit DisplayView() {
SetLayoutManager(new views::BoxLayout(
@@ -139,7 +138,7 @@ class DisplayView : 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_DISPLAY).ToImageSkia());
AddChildView(image_);
@@ -436,5 +435,4 @@ bool TrayDisplay::GetAccessibleStateForTesting(ui::AXViewState* state) {
return false;
}
-} // namespace internal
} // namespace ash
« no previous file with comments | « ash/system/chromeos/tray_display.h ('k') | ash/system/chromeos/tray_display_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698