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

Unified Diff: content/shell/shell_stacking_client_ash.h

Issue 11614037: Call ShowRootWindow on NativeWindow's RootWindow to display the window. (Closed) Base URL: https://git.chromium.org/chromium/src.git@master
Patch Set: Rewored patch Created 7 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
Index: content/shell/shell_stacking_client_ash.h
diff --git a/content/shell/shell_stacking_client_ash.h b/content/shell/shell_stacking_client_ash.h
index de169c4932a881199b8bd2d6d85318204cf590b2..bce0a4447a682513e22df14b911a1de2f5d47775 100644
--- a/content/shell/shell_stacking_client_ash.h
+++ b/content/shell/shell_stacking_client_ash.h
@@ -39,20 +39,20 @@ namespace content {
// the ash parts of the code.
class ShellStackingClientAsh : public aura::client::StackingClient {
public:
- ShellStackingClientAsh();
+ explicit ShellStackingClientAsh(
+ scoped_ptr<aura::RootWindow> root_window);
virtual ~ShellStackingClientAsh();
-
// Overridden from client::StackingClient:
virtual aura::Window* GetDefaultParent(aura::Window* context,
aura::Window* window,
const gfx::Rect& bounds) OVERRIDE;
-
private:
+ void Init();
+
scoped_ptr<aura::RootWindow> root_window_;
// Owned by RootWindow
views::corewm::CompoundEventFilter* root_window_event_filter_;
-
scoped_ptr<aura::client::DefaultCaptureClient> capture_client_;
scoped_ptr<views::corewm::InputMethodEventFilter> input_method_filter_;
scoped_ptr<aura::test::TestActivationClient> test_activation_client_;

Powered by Google App Engine
This is Rietveld 408576698