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

Side by Side Diff: trunk/src/content/browser/aura/image_transport_factory.cc

Issue 137853019: Revert 245131 "Add the UI compositor to the Mac build", which caused Mac ASan redness (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 11 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
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/browser/aura/image_transport_factory.h" 5 #include "content/browser/aura/image_transport_factory.h"
6 6
7 #include "content/browser/aura/gpu_process_transport_factory.h" 7 #include "content/browser/aura/gpu_process_transport_factory.h"
8 #include "content/browser/aura/no_transport_image_transport_factory.h" 8 #include "content/browser/aura/no_transport_image_transport_factory.h"
9 #include "ui/compositor/compositor.h" 9 #include "ui/compositor/compositor.h"
10 10
(...skipping 29 matching lines...) Expand all
40 g_factory = NULL; 40 g_factory = NULL;
41 g_initialized_for_unit_tests = false; 41 g_initialized_for_unit_tests = false;
42 } 42 }
43 43
44 // static 44 // static
45 ImageTransportFactory* ImageTransportFactory::GetInstance() { 45 ImageTransportFactory* ImageTransportFactory::GetInstance() {
46 return g_factory; 46 return g_factory;
47 } 47 }
48 48
49 } // namespace content 49 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698