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

Unified Diff: mash/wm/window_manager_application.cc

Issue 1527183003: Change mojo enums to be scoped enums in the generated C++ bindings. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@mojo-binding-equals
Patch Set: rebase Created 4 years, 11 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 | « mash/wm/window_layout.cc ('k') | mash/wm/window_manager_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mash/wm/window_manager_application.cc
diff --git a/mash/wm/window_manager_application.cc b/mash/wm/window_manager_application.cc
index 4436e2e788cfa62d191a9bdfce7bad908afa1993..1d5da1614fc3fc69337ca4c60b2f5b854eae7aa9 100644
--- a/mash/wm/window_manager_application.cc
+++ b/mash/wm/window_manager_application.cc
@@ -64,8 +64,8 @@ bool WindowManagerApplication::WindowIsContainer(
void WindowManagerApplication::AddAccelerators() {
window_tree_host_->AddAccelerator(
kWindowSwitchCmd,
- mus::CreateKeyMatcher(mus::mojom::KEYBOARD_CODE_TAB,
- mus::mojom::EVENT_FLAGS_CONTROL_DOWN),
+ mus::CreateKeyMatcher(mus::mojom::KeyboardCode::TAB,
+ mus::mojom::kEventFlagControlDown),
base::Bind(&AssertTrue));
}
@@ -120,13 +120,13 @@ void WindowManagerApplication::OnEmbed(mus::Window* root) {
root_->AddObserver(this);
CreateContainers();
background_layout_.reset(new BackgroundLayout(
- GetWindowForContainer(mojom::CONTAINER_USER_BACKGROUND)));
+ GetWindowForContainer(mojom::Container::USER_BACKGROUND)));
shelf_layout_.reset(
- new ShelfLayout(GetWindowForContainer(mojom::CONTAINER_USER_SHELF)));
+ new ShelfLayout(GetWindowForContainer(mojom::Container::USER_SHELF)));
- mus::Window* window = GetWindowForContainer(mojom::CONTAINER_USER_WINDOWS);
+ mus::Window* window = GetWindowForContainer(mojom::Container::USER_WINDOWS);
window_layout_.reset(
- new WindowLayout(GetWindowForContainer(mojom::CONTAINER_USER_WINDOWS)));
+ new WindowLayout(GetWindowForContainer(mojom::Container::USER_WINDOWS)));
window_tree_host_->AddActivationParent(window->id());
window_tree_host_->SetTitle("Mash");
@@ -213,8 +213,9 @@ void WindowManagerApplication::OnWindowDestroyed(mus::Window* window) {
void WindowManagerApplication::CreateContainers() {
for (uint16_t container =
- static_cast<uint16_t>(mojom::CONTAINER_ALL_USER_BACKGROUND);
- container < static_cast<uint16_t>(mojom::CONTAINER_COUNT); ++container) {
+ static_cast<uint16_t>(mojom::Container::ALL_USER_BACKGROUND);
+ container < static_cast<uint16_t>(mojom::Container::COUNT);
+ ++container) {
mus::Window* window = root_->connection()->NewWindow();
DCHECK_EQ(mus::LoWord(window->id()), container)
<< "Containers must be created before other windows!";
« no previous file with comments | « mash/wm/window_layout.cc ('k') | mash/wm/window_manager_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698