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

Unified Diff: services/window_manager/focus_controller.cc

Issue 788453002: Put code in //services/window_manager in namespace window_manager (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years 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 | « services/window_manager/focus_controller.h ('k') | services/window_manager/focus_controller_observer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: services/window_manager/focus_controller.cc
diff --git a/services/window_manager/focus_controller.cc b/services/window_manager/focus_controller.cc
index 560c441ec663d12f97698a2e9c4c0710c9dca1a0..69512595fe155e742f4a32ddbafb495fcc08f768 100644
--- a/services/window_manager/focus_controller.cc
+++ b/services/window_manager/focus_controller.cc
@@ -13,9 +13,11 @@
#include "services/window_manager/window_manager_app.h"
#include "ui/events/event.h"
-DECLARE_VIEW_PROPERTY_TYPE(mojo::FocusController*);
+DECLARE_VIEW_PROPERTY_TYPE(window_manager::FocusController*);
-namespace mojo {
+using mojo::View;
+
+namespace window_manager {
namespace {
DEFINE_VIEW_PROPERTY_KEY(FocusController*, kRootViewFocusController, nullptr);
@@ -198,7 +200,7 @@ void FocusController::SetFocusedView(View* view) {
// Allow for the window losing focus to be deleted during dispatch. If it is
// deleted pass null to observers instead of a deleted window.
- ViewTracker view_tracker;
+ mojo::ViewTracker view_tracker;
if (lost_focus)
view_tracker.Add(lost_focus);
if (focused_view_ && observer_manager_.IsObserving(focused_view_) &&
@@ -245,7 +247,7 @@ void FocusController::SetActiveView(View* requested_view, View* view) {
View* lost_activation = active_view_;
// Allow for the window losing activation to be deleted during dispatch. If
// it is deleted pass null to observers instead of a deleted window.
- ViewTracker view_tracker;
+ mojo::ViewTracker view_tracker;
if (lost_activation)
view_tracker.Add(lost_activation);
if (active_view_ && observer_manager_.IsObserving(active_view_) &&
@@ -317,4 +319,4 @@ FocusController* GetFocusController(View* root_view) {
root_view->GetLocalProperty(kRootViewFocusController) : nullptr;
}
-} // namespace mojo
+} // namespace window_manager
« no previous file with comments | « services/window_manager/focus_controller.h ('k') | services/window_manager/focus_controller_observer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698