summaryrefslogtreecommitdiffstats
path: root/mandoline/ui/phone_ui
diff options
context:
space:
mode:
authorfsamuel <fsamuel@chromium.org>2015-09-14 15:10:17 -0700
committerCommit bot <commit-bot@chromium.org>2015-09-14 22:11:02 +0000
commit80ad950ec6456f9aa0214d0b2c0cfd1bcdb0fae3 (patch)
tree1863787b3429efcdec8b7679d5adf1522deaa085 /mandoline/ui/phone_ui
parentca01f9e55651e4a7285f551e83bd561b01787c19 (diff)
downloadchromium_src-80ad950ec6456f9aa0214d0b2c0cfd1bcdb0fae3.zip
chromium_src-80ad950ec6456f9aa0214d0b2c0cfd1bcdb0fae3.tar.gz
chromium_src-80ad950ec6456f9aa0214d0b2c0cfd1bcdb0fae3.tar.bz2
Mandoline: Rename components/view_manager to components/mus
The name View Manager doesn't really capture the extent of what we'd like to accomplish here. Renaming this directory to mus (Mandoline UI Services). Some classes and namespaces need to change to but I'll do that in a separate CL. BUG=531533 TBR=jochen@chromium.org for components rename. Review URL: https://codereview.chromium.org/1344573002 Cr-Commit-Position: refs/heads/master@{#348735}
Diffstat (limited to 'mandoline/ui/phone_ui')
-rw-r--r--mandoline/ui/phone_ui/BUILD.gn4
-rw-r--r--mandoline/ui/phone_ui/DEPS2
-rw-r--r--mandoline/ui/phone_ui/phone_browser_application_delegate.cc6
-rw-r--r--mandoline/ui/phone_ui/phone_browser_application_delegate.h6
4 files changed, 9 insertions, 9 deletions
diff --git a/mandoline/ui/phone_ui/BUILD.gn b/mandoline/ui/phone_ui/BUILD.gn
index 5f4f7cc..3a6ee3b 100644
--- a/mandoline/ui/phone_ui/BUILD.gn
+++ b/mandoline/ui/phone_ui/BUILD.gn
@@ -25,8 +25,8 @@ source_set("lib") {
deps = [
"//base",
- "//components/view_manager/public/cpp",
- "//components/view_manager/public/interfaces",
+ "//components/mus/public/cpp",
+ "//components/mus/public/interfaces",
"//components/web_view/public/cpp",
"//components/web_view/public/interfaces",
"//mandoline/ui/desktop_ui/public/interfaces",
diff --git a/mandoline/ui/phone_ui/DEPS b/mandoline/ui/phone_ui/DEPS
index dcff3eb..ffc6361 100644
--- a/mandoline/ui/phone_ui/DEPS
+++ b/mandoline/ui/phone_ui/DEPS
@@ -1,5 +1,5 @@
include_rules = [
- "+components/view_manager",
+ "+components/mus",
"+components/web_view/public",
"+mojo/application",
"+mojo/common",
diff --git a/mandoline/ui/phone_ui/phone_browser_application_delegate.cc b/mandoline/ui/phone_ui/phone_browser_application_delegate.cc
index dddc9f9..b43910c 100644
--- a/mandoline/ui/phone_ui/phone_browser_application_delegate.cc
+++ b/mandoline/ui/phone_ui/phone_browser_application_delegate.cc
@@ -5,9 +5,9 @@
#include "mandoline/ui/phone_ui/phone_browser_application_delegate.h"
#include "base/command_line.h"
-#include "components/view_manager/public/cpp/view.h"
-#include "components/view_manager/public/cpp/view_tree_connection.h"
-#include "components/view_manager/public/cpp/view_tree_host_factory.h"
+#include "components/mus/public/cpp/view.h"
+#include "components/mus/public/cpp/view_tree_connection.h"
+#include "components/mus/public/cpp/view_tree_host_factory.h"
#include "mojo/application/public/cpp/application_connection.h"
#include "mojo/application/public/cpp/application_impl.h"
#include "mojo/converters/geometry/geometry_type_converters.h"
diff --git a/mandoline/ui/phone_ui/phone_browser_application_delegate.h b/mandoline/ui/phone_ui/phone_browser_application_delegate.h
index c39e61b..cca1bfc 100644
--- a/mandoline/ui/phone_ui/phone_browser_application_delegate.h
+++ b/mandoline/ui/phone_ui/phone_browser_application_delegate.h
@@ -7,9 +7,9 @@
#include "base/macros.h"
#include "base/memory/scoped_ptr.h"
-#include "components/view_manager/public/cpp/view_observer.h"
-#include "components/view_manager/public/cpp/view_tree_delegate.h"
-#include "components/view_manager/public/interfaces/view_tree_host.mojom.h"
+#include "components/mus/public/cpp/view_observer.h"
+#include "components/mus/public/cpp/view_tree_delegate.h"
+#include "components/mus/public/interfaces/view_tree_host.mojom.h"
#include "components/web_view/public/cpp/web_view.h"
#include "components/web_view/public/interfaces/web_view.mojom.h"
// TODO(beng): move this file somewhere common.