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

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

Issue 10963045: Makes closing a fullscreen window refocus the window it came from. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 3 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | content/browser/renderer_host/render_widget_host_view_aura.cc » ('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 #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 <vector> 9 #include <vector>
10 10
11 #include "base/callback.h" 11 #include "base/callback.h"
12 #include "base/memory/linked_ptr.h" 12 #include "base/memory/linked_ptr.h"
13 #include "base/memory/ref_counted.h" 13 #include "base/memory/ref_counted.h"
14 #include "base/memory/weak_ptr.h" 14 #include "base/memory/weak_ptr.h"
15 #include "content/browser/renderer_host/image_transport_factory.h" 15 #include "content/browser/renderer_host/image_transport_factory.h"
16 #include "content/browser/renderer_host/render_widget_host_view_base.h" 16 #include "content/browser/renderer_host/render_widget_host_view_base.h"
17 #include "content/common/content_export.h" 17 #include "content/common/content_export.h"
18 #include "ui/aura/client/activation_delegate.h" 18 #include "ui/aura/client/activation_delegate.h"
19 #include "ui/aura/window_delegate.h" 19 #include "ui/aura/window_delegate.h"
20 #include "ui/base/ime/text_input_client.h" 20 #include "ui/base/ime/text_input_client.h"
21 #include "ui/compositor/compositor_observer.h" 21 #include "ui/compositor/compositor_observer.h"
22 #include "ui/gfx/rect.h" 22 #include "ui/gfx/rect.h"
23 #include "webkit/glue/webcursor.h" 23 #include "webkit/glue/webcursor.h"
24 24
25 namespace aura { 25 namespace aura {
26 class CompositorLock; 26 class CompositorLock;
27 class WindowTracker;
27 } 28 }
28 29
29 namespace gfx { 30 namespace gfx {
30 class Canvas; 31 class Canvas;
31 } 32 }
32 33
33 namespace ui { 34 namespace ui {
34 class InputMethod; 35 class InputMethod;
35 class Texture; 36 class Texture;
36 } 37 }
(...skipping 341 matching lines...) Expand 10 before | Expand all | Expand 10 after
378 class ResizeLock; 379 class ResizeLock;
379 // These locks are the ones waiting for a texture of the right size to come 380 // These locks are the ones waiting for a texture of the right size to come
380 // back from the renderer/GPU process. 381 // back from the renderer/GPU process.
381 std::vector<linked_ptr<ResizeLock> > resize_locks_; 382 std::vector<linked_ptr<ResizeLock> > resize_locks_;
382 // These locks are the ones waiting for a frame to be drawn. 383 // These locks are the ones waiting for a frame to be drawn.
383 std::vector<linked_ptr<ResizeLock> > locks_pending_draw_; 384 std::vector<linked_ptr<ResizeLock> > locks_pending_draw_;
384 385
385 // This lock is for waiting for a front surface to become available to draw. 386 // This lock is for waiting for a front surface to become available to draw.
386 scoped_refptr<aura::CompositorLock> released_front_lock_; 387 scoped_refptr<aura::CompositorLock> released_front_lock_;
387 388
389 // Used to track the state of the window we're created from. Only used when
390 // created fullscreen.
391 scoped_ptr<aura::WindowTracker> host_tracker_;
392
388 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura); 393 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura);
389 }; 394 };
390 395
391 } // namespace content 396 } // namespace content
392 397
393 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ 398 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_
OLDNEW
« no previous file with comments | « no previous file | content/browser/renderer_host/render_widget_host_view_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698