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

Unified Diff: ui/aura/mus/window_manager_delegate.cc

Issue 2445163002: Make aura work with mus (Closed)
Patch Set: NON_EXPORTED_BASE_CLASS Created 4 years, 2 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 | « ui/aura/mus/window_manager_delegate.h ('k') | ui/aura/mus/window_mus.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura/mus/window_manager_delegate.cc
diff --git a/services/ui/public/cpp/window_manager_delegate.cc b/ui/aura/mus/window_manager_delegate.cc
similarity index 53%
copy from services/ui/public/cpp/window_manager_delegate.cc
copy to ui/aura/mus/window_manager_delegate.cc
index e049b4e140501881d1d0d657415fa9defcbc1b71..2efab15d720b8d606c1513d5566fbcd13a5b1ef0 100644
--- a/services/ui/public/cpp/window_manager_delegate.cc
+++ b/ui/aura/mus/window_manager_delegate.cc
@@ -2,14 +2,14 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "services/ui/public/cpp/window_manager_delegate.h"
+#include "ui/aura/mus/window_manager_delegate.h"
-namespace ui {
+namespace aura {
-mojom::EventResult WindowManagerDelegate::OnAccelerator(
+ui::mojom::EventResult WindowManagerDelegate::OnAccelerator(
uint32_t id,
const ui::Event& event) {
- return mojom::EventResult::UNHANDLED;
+ return ui::mojom::EventResult::UNHANDLED;
}
-} // namespace ui
+} // namespace aura
« no previous file with comments | « ui/aura/mus/window_manager_delegate.h ('k') | ui/aura/mus/window_mus.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698