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

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

Issue 1927463002: Rename gfx::Display/Screen to display::Display/Screen in content/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 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
« no previous file with comments | « no previous file | content/browser/media/capture/web_contents_video_capture_device_unittest.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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/browser/media/capture/aura_window_capture_machine.h" 5 #include "content/browser/media/capture/aura_window_capture_machine.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 13 matching lines...) Expand all
24 #include "third_party/skia/include/core/SkBitmap.h" 24 #include "third_party/skia/include/core/SkBitmap.h"
25 #include "ui/aura/client/screen_position_client.h" 25 #include "ui/aura/client/screen_position_client.h"
26 #include "ui/aura/env.h" 26 #include "ui/aura/env.h"
27 #include "ui/aura/window.h" 27 #include "ui/aura/window.h"
28 #include "ui/aura/window_observer.h" 28 #include "ui/aura/window_observer.h"
29 #include "ui/aura/window_tree_host.h" 29 #include "ui/aura/window_tree_host.h"
30 #include "ui/base/cursor/cursors_aura.h" 30 #include "ui/base/cursor/cursors_aura.h"
31 #include "ui/compositor/compositor.h" 31 #include "ui/compositor/compositor.h"
32 #include "ui/compositor/dip_util.h" 32 #include "ui/compositor/dip_util.h"
33 #include "ui/compositor/layer.h" 33 #include "ui/compositor/layer.h"
34 #include "ui/gfx/screen.h"
35 #include "ui/wm/public/activation_client.h" 34 #include "ui/wm/public/activation_client.h"
36 35
37 namespace content { 36 namespace content {
38 37
39 AuraWindowCaptureMachine::AuraWindowCaptureMachine() 38 AuraWindowCaptureMachine::AuraWindowCaptureMachine()
40 : desktop_window_(NULL), 39 : desktop_window_(NULL),
41 screen_capture_(false), 40 screen_capture_(false),
42 weak_factory_(this) {} 41 weak_factory_(this) {}
43 42
44 AuraWindowCaptureMachine::~AuraWindowCaptureMachine() {} 43 AuraWindowCaptureMachine::~AuraWindowCaptureMachine() {}
(...skipping 367 matching lines...) Expand 10 before | Expand all | Expand 10 after
412 Capture(timestamp); 411 Capture(timestamp);
413 } 412 }
414 413
415 void AuraWindowCaptureMachine::OnCompositingShuttingDown( 414 void AuraWindowCaptureMachine::OnCompositingShuttingDown(
416 ui::Compositor* compositor) { 415 ui::Compositor* compositor) {
417 DCHECK_CURRENTLY_ON(BrowserThread::UI); 416 DCHECK_CURRENTLY_ON(BrowserThread::UI);
418 compositor->RemoveAnimationObserver(this); 417 compositor->RemoveAnimationObserver(this);
419 } 418 }
420 419
421 } // namespace content 420 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | content/browser/media/capture/web_contents_video_capture_device_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698