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

Unified Diff: ui/aura/desktop/desktop_stacking_client.cc

Issue 11377140: re-re-land of https://codereview.chromium.org/11364053/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: more renames\! Created 8 years, 1 month 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/desktop/desktop_stacking_client.h ('k') | ui/aura/test/test_stacking_client.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura/desktop/desktop_stacking_client.cc
diff --git a/ui/aura/desktop/desktop_stacking_client.cc b/ui/aura/desktop/desktop_stacking_client.cc
deleted file mode 100644
index ccc77954417ca4e1491a7b9aa739a4d437716ee2..0000000000000000000000000000000000000000
--- a/ui/aura/desktop/desktop_stacking_client.cc
+++ /dev/null
@@ -1,60 +0,0 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "ui/aura/desktop/desktop_stacking_client.h"
-
-#include "ui/aura/client/activation_client.h"
-#include "ui/aura/client/default_capture_client.h"
-#include "ui/aura/desktop/desktop_activation_client.h"
-#include "ui/aura/focus_manager.h"
-#include "ui/aura/root_window.h"
-#include "ui/aura/window.h"
-#include "ui/views/corewm/compound_event_filter.h"
-#include "ui/views/corewm/input_method_event_filter.h"
-
-namespace aura {
-
-DesktopStackingClient::DesktopStackingClient()
- : window_event_filter_(NULL) {
- client::SetStackingClient(this);
-}
-
-DesktopStackingClient::~DesktopStackingClient() {
- if (window_event_filter_)
- window_event_filter_->RemoveFilter(input_method_filter_.get());
-
- client::SetStackingClient(NULL);
-}
-
-Window* DesktopStackingClient::GetDefaultParent(Window* window,
- const gfx::Rect& bounds) {
- if (!null_parent_.get())
- CreateNULLParent();
-
- return null_parent_.get();
-}
-
-void DesktopStackingClient::CreateNULLParent() {
- focus_manager_.reset(new FocusManager);
-
- activation_client_.reset(new DesktopActivationClient(focus_manager_.get()));
-
- null_parent_.reset(new RootWindow(
- RootWindow::CreateParams(gfx::Rect(100, 100))));
- null_parent_->Init();
- null_parent_->set_focus_manager(focus_manager_.get());
-
- client::SetActivationClient(null_parent_.get(), activation_client_.get());
-
- window_event_filter_ = new views::corewm::CompoundEventFilter;
- null_parent_->SetEventFilter(window_event_filter_);
-
- input_method_filter_.reset(new views::corewm::InputMethodEventFilter);
- input_method_filter_->SetInputMethodPropertyInRootWindow(null_parent_.get());
- window_event_filter_->AddFilter(input_method_filter_.get());
-
- capture_client_.reset(new client::DefaultCaptureClient(null_parent_.get()));
-}
-
-} // namespace aura
« no previous file with comments | « ui/aura/desktop/desktop_stacking_client.h ('k') | ui/aura/test/test_stacking_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698