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

Side by Side Diff: components/window_manager/focus_controller.cc

Issue 1085233004: Moves services implementations out of third_party/mojo_services (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: unnecessary changes Created 5 years, 8 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "components/window_manager/focus_controller.h" 5 #include "components/window_manager/focus_controller.h"
6 6
7 #include "base/auto_reset.h" 7 #include "base/auto_reset.h"
8 #include "components/view_manager/public/cpp/view_property.h"
9 #include "components/view_manager/public/cpp/view_tracker.h"
8 #include "components/window_manager/focus_controller_observer.h" 10 #include "components/window_manager/focus_controller_observer.h"
9 #include "components/window_manager/focus_rules.h" 11 #include "components/window_manager/focus_rules.h"
10 #include "components/window_manager/view_target.h" 12 #include "components/window_manager/view_target.h"
11 #include "components/window_manager/window_manager_app.h" 13 #include "components/window_manager/window_manager_app.h"
12 #include "third_party/mojo_services/src/view_manager/public/cpp/view_property.h"
13 #include "third_party/mojo_services/src/view_manager/public/cpp/view_tracker.h"
14 #include "ui/events/event.h" 14 #include "ui/events/event.h"
15 15
16 DECLARE_VIEW_PROPERTY_TYPE(window_manager::FocusController*); 16 DECLARE_VIEW_PROPERTY_TYPE(window_manager::FocusController*);
17 17
18 using mojo::View; 18 using mojo::View;
19 19
20 namespace window_manager { 20 namespace window_manager {
21 21
22 namespace { 22 namespace {
23 DEFINE_VIEW_PROPERTY_KEY(FocusController*, kRootViewFocusController, nullptr); 23 DEFINE_VIEW_PROPERTY_KEY(FocusController*, kRootViewFocusController, nullptr);
(...skipping 284 matching lines...) Expand 10 before | Expand all | Expand 10 after
308 } 308 }
309 309
310 FocusController* GetFocusController(View* root_view) { 310 FocusController* GetFocusController(View* root_view) {
311 if (root_view) 311 if (root_view)
312 DCHECK_EQ(root_view->GetRoot(), root_view); 312 DCHECK_EQ(root_view->GetRoot(), root_view);
313 return root_view ? 313 return root_view ?
314 root_view->GetLocalProperty(kRootViewFocusController) : nullptr; 314 root_view->GetLocalProperty(kRootViewFocusController) : nullptr;
315 } 315 }
316 316
317 } // namespace window_manager 317 } // namespace window_manager
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698