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

Side by Side Diff: content/shell/shell_stacking_client_ash.cc

Issue 11368010: Move aura shared and desktop classes to the views target. Note that the files don't actually move, … (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « content/shell/shell_stacking_client_ash.h ('k') | ui/aura/aura.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/shell/shell_stacking_client_ash.h" 5 #include "content/shell/shell_stacking_client_ash.h"
6 6
7 #include "ui/aura/client/default_capture_client.h"
7 #include "ui/aura/focus_manager.h" 8 #include "ui/aura/focus_manager.h"
8 #include "ui/aura/root_window.h" 9 #include "ui/aura/root_window.h"
9 #include "ui/aura/shared/compound_event_filter.h" 10 #include "ui/aura/shared/compound_event_filter.h"
10 #include "ui/aura/shared/input_method_event_filter.h" 11 #include "ui/aura/shared/input_method_event_filter.h"
11 #include "ui/aura/shared/root_window_capture_client.h"
12 #include "ui/aura/test/test_activation_client.h" 12 #include "ui/aura/test/test_activation_client.h"
13 13
14 namespace content { 14 namespace content {
15 15
16 ShellStackingClientAsh::ShellStackingClientAsh() { 16 ShellStackingClientAsh::ShellStackingClientAsh() {
17 aura::client::SetStackingClient(this); 17 aura::client::SetStackingClient(this);
18 } 18 }
19 19
20 ShellStackingClientAsh::~ShellStackingClientAsh() { 20 ShellStackingClientAsh::~ShellStackingClientAsh() {
21 if (root_window_.get()) 21 if (root_window_.get())
(...skipping 19 matching lines...) Expand all
41 41
42 input_method_filter_.reset(new aura::shared::InputMethodEventFilter()); 42 input_method_filter_.reset(new aura::shared::InputMethodEventFilter());
43 input_method_filter_->SetInputMethodPropertyInRootWindow( 43 input_method_filter_->SetInputMethodPropertyInRootWindow(
44 root_window_.get()); 44 root_window_.get());
45 root_window_event_filter_->AddFilter(input_method_filter_.get()); 45 root_window_event_filter_->AddFilter(input_method_filter_.get());
46 46
47 test_activation_client_.reset( 47 test_activation_client_.reset(
48 new aura::test::TestActivationClient(root_window_.get())); 48 new aura::test::TestActivationClient(root_window_.get()));
49 49
50 capture_client_.reset( 50 capture_client_.reset(
51 new aura::shared::RootWindowCaptureClient(root_window_.get())); 51 new aura::client::DefaultCaptureClient(root_window_.get()));
52 } 52 }
53 return root_window_.get(); 53 return root_window_.get();
54 } 54 }
55 55
56 } // namespace content 56 } // namespace content
OLDNEW
« no previous file with comments | « content/shell/shell_stacking_client_ash.h ('k') | ui/aura/aura.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698