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

Unified Diff: ash/system/web_notification/web_notification_tray.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
Index: ash/system/web_notification/web_notification_tray.cc
diff --git a/ash/system/web_notification/web_notification_tray.cc b/ash/system/web_notification/web_notification_tray.cc
index e1431433c333bc9dce537f4ba50a60858da6df1f..40c2539d6eb5fa60e184c22af88f14218080c8c5 100644
--- a/ash/system/web_notification/web_notification_tray.cc
+++ b/ash/system/web_notification/web_notification_tray.cc
@@ -63,7 +63,6 @@ const int kEnableQuietModeDay = 2;
}
-namespace internal {
namespace {
const SkColor kWebNotificationColorNoUnread = SkColorSetA(SK_ColorWHITE, 128);
@@ -233,7 +232,7 @@ class WebNotificationBubbleWrapper {
private:
scoped_ptr<message_center::MessageBubbleBase> bubble_;
- scoped_ptr<internal::TrayBubbleWrapper> bubble_wrapper_;
+ scoped_ptr<TrayBubbleWrapper> bubble_wrapper_;
DISALLOW_COPY_AND_ASSIGN(WebNotificationBubbleWrapper);
};
@@ -297,16 +296,13 @@ class WebNotificationButton : public views::CustomButton {
DISALLOW_COPY_AND_ASSIGN(WebNotificationButton);
};
-} // namespace internal
-
-WebNotificationTray::WebNotificationTray(
- internal::StatusAreaWidget* status_area_widget)
+WebNotificationTray::WebNotificationTray(StatusAreaWidget* status_area_widget)
: TrayBackgroundView(status_area_widget),
button_(NULL),
show_message_center_on_unlock_(false),
should_update_tray_content_(false),
should_block_shelf_auto_hide_(false) {
- button_ = new internal::WebNotificationButton(this);
+ button_ = new WebNotificationButton(this);
button_->set_triggerable_event_flags(
ui::EF_LEFT_MOUSE_BUTTON | ui::EF_RIGHT_MOUSE_BUTTON);
tray_container()->AddChildView(button_);
@@ -319,11 +315,11 @@ WebNotificationTray::WebNotificationTray(
popup_collection_.reset(new message_center::MessagePopupCollection(
ash::Shell::GetContainer(
status_area_widget->GetNativeView()->GetRootWindow(),
- internal::kShellWindowId_StatusContainer),
+ kShellWindowId_StatusContainer),
message_center(),
message_center_tray_.get(),
ash::switches::UseAlternateShelfLayout()));
- work_area_observer_.reset(new internal::WorkAreaObserver());
+ work_area_observer_.reset(new WorkAreaObserver());
work_area_observer_->StartObserving(
popup_collection_.get(),
status_area_widget->GetNativeView()->GetRootWindow());
@@ -380,7 +376,7 @@ bool WebNotificationTray::ShowMessageCenterInternal(bool show_settings) {
if (show_settings)
message_center_bubble->SetSettingsVisible();
message_center_bubble_.reset(
- new internal::WebNotificationBubbleWrapper(this, message_center_bubble));
+ new WebNotificationBubbleWrapper(this, message_center_bubble));
status_area_widget()->SetHideSystemNotifications(true);
GetShelfLayoutManager()->UpdateAutoHideState();
@@ -456,7 +452,7 @@ void WebNotificationTray::UpdateAfterLoginStatusChange(
void WebNotificationTray::SetShelfAlignment(ShelfAlignment alignment) {
if (alignment == shelf_alignment())
return;
- internal::TrayBackgroundView::SetShelfAlignment(alignment);
+ TrayBackgroundView::SetShelfAlignment(alignment);
tray_container()->SetBorder(views::Border::NullBorder());
// Destroy any existing bubble so that it will be rebuilt correctly.
message_center_tray_->HideMessageCenterBubble();
« no previous file with comments | « ash/system/web_notification/web_notification_tray.h ('k') | ash/system/web_notification/web_notification_tray_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698