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

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

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/demo/demo_main.cc ('k') | ui/aura/desktop/desktop_stacking_client.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura/desktop/desktop_stacking_client.h
diff --git a/ui/aura/desktop/desktop_stacking_client.h b/ui/aura/desktop/desktop_stacking_client.h
deleted file mode 100644
index ab3e849b0bbe6e22b82879d82bc57feeb10e820f..0000000000000000000000000000000000000000
--- a/ui/aura/desktop/desktop_stacking_client.h
+++ /dev/null
@@ -1,65 +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.
-
-#ifndef UI_AURA_DESKTOP_DESKTOP_STACKING_CLIENT_H_
-#define UI_AURA_DESKTOP_DESKTOP_STACKING_CLIENT_H_
-
-#include "ui/aura/client/stacking_client.h"
-
-#include "base/basictypes.h"
-#include "base/compiler_specific.h"
-#include "base/memory/scoped_ptr.h"
-#include "ui/views/views_export.h"
-
-namespace views {
-namespace corewm {
-class CompoundEventFilter;
-class InputMethodEventFilter;
-}
-}
-
-namespace aura {
-class DesktopActivationClient;
-class FocusManager;
-class RootWindow;
-class Window;
-
-namespace client {
-class DefaultCaptureClient;
-}
-
-// A stacking client for the desktop; always sets the default parent to the
-// RootWindow of the passed in Window.
-class VIEWS_EXPORT DesktopStackingClient : public client::StackingClient {
- public:
- DesktopStackingClient();
- virtual ~DesktopStackingClient();
-
- // Overridden from client::StackingClient:
- virtual Window* GetDefaultParent(Window* window,
- const gfx::Rect& bounds) OVERRIDE;
-
- private:
- void CreateNULLParent();
-
- // Windows with NULL parents are parented to this.
- scoped_ptr<RootWindow> null_parent_;
-
- // All the member variables below are necessary for the NULL parent root
- // window to function.
- scoped_ptr<FocusManager> focus_manager_;
- // Depends on focus_manager_.
- scoped_ptr<DesktopActivationClient> activation_client_;
-
- scoped_ptr<views::corewm::InputMethodEventFilter> input_method_filter_;
- views::corewm::CompoundEventFilter* window_event_filter_;
-
- scoped_ptr<client::DefaultCaptureClient> capture_client_;
-
- DISALLOW_COPY_AND_ASSIGN(DesktopStackingClient);
-};
-
-} // namespace aura
-
-#endif // UI_AURA_DESKTOP_DESKTOP_STACKING_CLIENT_H_
« no previous file with comments | « ui/aura/demo/demo_main.cc ('k') | ui/aura/desktop/desktop_stacking_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698