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

Side by Side Diff: content/browser/media/capture/aura_window_capture_machine.h

Issue 1327673006: Crash fix for window closed during Aura window capture. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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_MEDIA_CAPTURE_AURA_WINDOW_CAPTURE_MACHINE_H_ 5 #ifndef CONTENT_BROWSER_MEDIA_CAPTURE_AURA_WINDOW_CAPTURE_MACHINE_H_
6 #define CONTENT_BROWSER_MEDIA_CAPTURE_AURA_WINDOW_CAPTURE_MACHINE_H_ 6 #define CONTENT_BROWSER_MEDIA_CAPTURE_AURA_WINDOW_CAPTURE_MACHINE_H_
7 7
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "base/memory/weak_ptr.h" 9 #include "base/memory/weak_ptr.h"
10 #include "base/timer/timer.h" 10 #include "base/timer/timer.h"
(...skipping 26 matching lines...) Expand all
37 // VideoCaptureMachine overrides. 37 // VideoCaptureMachine overrides.
38 void Start(const scoped_refptr<media::ThreadSafeCaptureOracle>& oracle_proxy, 38 void Start(const scoped_refptr<media::ThreadSafeCaptureOracle>& oracle_proxy,
39 const media::VideoCaptureParams& params, 39 const media::VideoCaptureParams& params,
40 const base::Callback<void(bool)> callback) override; 40 const base::Callback<void(bool)> callback) override;
41 void Stop(const base::Closure& callback) override; 41 void Stop(const base::Closure& callback) override;
42 42
43 // Implements aura::WindowObserver. 43 // Implements aura::WindowObserver.
44 void OnWindowBoundsChanged(aura::Window* window, 44 void OnWindowBoundsChanged(aura::Window* window,
45 const gfx::Rect& old_bounds, 45 const gfx::Rect& old_bounds,
46 const gfx::Rect& new_bounds) override; 46 const gfx::Rect& new_bounds) override;
47 void OnWindowDestroyed(aura::Window* window) override; 47 void OnWindowDestroying(aura::Window* window) override;
48 void OnWindowAddedToRootWindow(aura::Window* window) override; 48 void OnWindowAddedToRootWindow(aura::Window* window) override;
49 void OnWindowRemovingFromRootWindow(aura::Window* window, 49 void OnWindowRemovingFromRootWindow(aura::Window* window,
50 aura::Window* new_root) override; 50 aura::Window* new_root) override;
51 51
52 // Implements ui::CompositorObserver. 52 // Implements ui::CompositorObserver.
53 void OnCompositingDidCommit(ui::Compositor* compositor) override {} 53 void OnCompositingDidCommit(ui::Compositor* compositor) override {}
54 void OnCompositingStarted(ui::Compositor* compositor, 54 void OnCompositingStarted(ui::Compositor* compositor,
55 base::TimeTicks start_time) override {} 55 base::TimeTicks start_time) override {}
56 void OnCompositingEnded(ui::Compositor* compositor) override; 56 void OnCompositingEnded(ui::Compositor* compositor) override;
57 void OnCompositingAborted(ui::Compositor* compositor) override {} 57 void OnCompositingAborted(ui::Compositor* compositor) override {}
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
128 // TODO(jiayl): Remove power_save_blocker_ when there is an API to keep the 128 // TODO(jiayl): Remove power_save_blocker_ when there is an API to keep the
129 // screen from sleeping for the drive-by web. 129 // screen from sleeping for the drive-by web.
130 scoped_ptr<PowerSaveBlocker> power_save_blocker_; 130 scoped_ptr<PowerSaveBlocker> power_save_blocker_;
131 131
132 DISALLOW_COPY_AND_ASSIGN(AuraWindowCaptureMachine); 132 DISALLOW_COPY_AND_ASSIGN(AuraWindowCaptureMachine);
133 }; 133 };
134 134
135 } // namespace content 135 } // namespace content
136 136
137 #endif // CONTENT_BROWSER_MEDIA_CAPTURE_AURA_WINDOW_CAPTURE_MACHINE_H_ 137 #endif // CONTENT_BROWSER_MEDIA_CAPTURE_AURA_WINDOW_CAPTURE_MACHINE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698