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

Unified Diff: ash/system/tray/tray_event_filter.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/tray_event_filter.h ('k') | ash/system/tray/tray_image_item.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/tray/tray_event_filter.cc
diff --git a/ash/system/tray/tray_event_filter.cc b/ash/system/tray/tray_event_filter.cc
index d15c83dea7bf87896409aa3b22471b3a36aeaa6d..5ed01225e4eba1cf62e882e81911547b89388c0b 100644
--- a/ash/system/tray/tray_event_filter.cc
+++ b/ash/system/tray/tray_event_filter.cc
@@ -18,7 +18,6 @@
#include "ui/views/widget/widget.h"
namespace ash {
-namespace internal {
TrayEventFilter::TrayEventFilter() {
}
@@ -56,10 +55,11 @@ bool TrayEventFilter::ProcessLocatedEvent(ui::LocatedEvent* event) {
if (event->target()) {
aura::Window* target = static_cast<aura::Window*>(event->target());
// Don't process events that occurred inside an embedded menu.
- internal::RootWindowController* root_controller =
- internal::GetRootWindowController(target->GetRootWindow());
- if (root_controller && root_controller->GetContainer(
- internal::kShellWindowId_MenuContainer)->Contains(target)) {
+ RootWindowController* root_controller =
+ GetRootWindowController(target->GetRootWindow());
+ if (root_controller &&
+ root_controller->GetContainer(kShellWindowId_MenuContainer)
+ ->Contains(target)) {
return false;
}
}
@@ -109,5 +109,4 @@ bool TrayEventFilter::ProcessLocatedEvent(ui::LocatedEvent* event) {
return handled;
}
-} // namespace internal
} // namespace ash
« no previous file with comments | « ash/system/tray/tray_event_filter.h ('k') | ash/system/tray/tray_image_item.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698