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

Unified Diff: ash/mus/window_manager.cc

Issue 2843193002: chromeos: fix focus for mushrome (Closed)
Patch Set: feedback Created 3 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/mus/bridge/shell_port_mash.cc ('k') | ash/mus/window_manager_common_unittests.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/mus/window_manager.cc
diff --git a/ash/mus/window_manager.cc b/ash/mus/window_manager.cc
index 4372ddf6dd5e413c437144bcaf66f482961fcb28..dbeae2c6a94fbe51e536b708ce68e972bd47c6e2 100644
--- a/ash/mus/window_manager.cc
+++ b/ash/mus/window_manager.cc
@@ -21,7 +21,6 @@
#include "ash/mus/window_properties.h"
#include "ash/public/cpp/config.h"
#include "ash/public/cpp/shelf_types.h"
-#include "ash/public/cpp/shell_window_ids.h"
#include "ash/public/cpp/window_pin_type.h"
#include "ash/public/cpp/window_properties.h"
#include "ash/public/interfaces/window_pin_type.mojom.h"
@@ -249,13 +248,6 @@ void WindowManager::CreateAndRegisterRootWindowController(
std::unique_ptr<RootWindowController> root_window_controller(
new RootWindowController(nullptr, window_tree_host.release()));
root_window_controller->Init(root_window_type);
- // TODO: To avoid lots of IPC AddActivationParent() should take an array.
- // http://crbug.com/682048.
- aura::Window* root_window = root_window_controller->GetRootWindow();
- for (size_t i = 0; i < kNumActivatableShellWindowIds; ++i) {
- window_manager_client_->AddActivationParent(
- root_window->GetChildById(kActivatableShellWindowIds[i]));
- }
root_window_controllers_.insert(std::move(root_window_controller));
}
« no previous file with comments | « ash/mus/bridge/shell_port_mash.cc ('k') | ash/mus/window_manager_common_unittests.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698