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

Side by Side Diff: content/browser/renderer_host/render_widget_host_view_aura.h

Issue 759433002: Reland: Move TouchSelectionController from content to ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Excluded ui/touch_selection from Windows GN build Created 6 years 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
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 #ifndef CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ 5 #ifndef CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_
6 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ 6 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_
7 7
8 #include <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 #include <string> 10 #include <string>
(...skipping 11 matching lines...) Expand all
22 #include "content/browser/compositor/owned_mailbox.h" 22 #include "content/browser/compositor/owned_mailbox.h"
23 #include "content/browser/renderer_host/render_widget_host_view_base.h" 23 #include "content/browser/renderer_host/render_widget_host_view_base.h"
24 #include "content/common/content_export.h" 24 #include "content/common/content_export.h"
25 #include "content/common/cursors/webcursor.h" 25 #include "content/common/cursors/webcursor.h"
26 #include "third_party/skia/include/core/SkRegion.h" 26 #include "third_party/skia/include/core/SkRegion.h"
27 #include "ui/aura/client/cursor_client_observer.h" 27 #include "ui/aura/client/cursor_client_observer.h"
28 #include "ui/aura/client/focus_change_observer.h" 28 #include "ui/aura/client/focus_change_observer.h"
29 #include "ui/aura/window_delegate.h" 29 #include "ui/aura/window_delegate.h"
30 #include "ui/aura/window_tree_host_observer.h" 30 #include "ui/aura/window_tree_host_observer.h"
31 #include "ui/base/ime/text_input_client.h" 31 #include "ui/base/ime/text_input_client.h"
32 #include "ui/base/touch/selection_bound.h"
32 #include "ui/base/touch/touch_editing_controller.h" 33 #include "ui/base/touch/touch_editing_controller.h"
33 #include "ui/gfx/display_observer.h" 34 #include "ui/gfx/display_observer.h"
34 #include "ui/gfx/insets.h" 35 #include "ui/gfx/insets.h"
35 #include "ui/gfx/rect.h" 36 #include "ui/gfx/rect.h"
36 #include "ui/wm/public/activation_change_observer.h" 37 #include "ui/wm/public/activation_change_observer.h"
37 #include "ui/wm/public/activation_delegate.h" 38 #include "ui/wm/public/activation_delegate.h"
38 39
39 namespace aura { 40 namespace aura {
40 class WindowTracker; 41 class WindowTracker;
41 namespace client { 42 namespace client {
(...skipping 582 matching lines...) Expand 10 before | Expand all | Expand 10 after
624 // compositing surface and showing the disambiguation popup. 625 // compositing surface and showing the disambiguation popup.
625 gfx::Vector2dF disambiguation_scroll_offset_; 626 gfx::Vector2dF disambiguation_scroll_offset_;
626 627
627 base::WeakPtrFactory<RenderWidgetHostViewAura> weak_ptr_factory_; 628 base::WeakPtrFactory<RenderWidgetHostViewAura> weak_ptr_factory_;
628 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura); 629 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura);
629 }; 630 };
630 631
631 } // namespace content 632 } // namespace content
632 633
633 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ 634 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698