| Index: cc/HeadsUpDisplayLayerChromium.h
|
| diff --git a/cc/HeadsUpDisplayLayerChromium.h b/cc/HeadsUpDisplayLayerChromium.h
|
| index cd2627e18f0bea18dacd732b5caab4f24a36f956..3d7a1385a6ab9210ac110aaf4e46e1d652342ab6 100644
|
| --- a/cc/HeadsUpDisplayLayerChromium.h
|
| +++ b/cc/HeadsUpDisplayLayerChromium.h
|
| @@ -2,37 +2,5 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef HeadsUpDisplayLayerChromium_h
|
| -#define HeadsUpDisplayLayerChromium_h
|
| -
|
| -#include "base/memory/scoped_ptr.h"
|
| -#include "CCFontAtlas.h"
|
| -#include "IntSize.h"
|
| -#include "LayerChromium.h"
|
| -
|
| -namespace cc {
|
| -
|
| -class HeadsUpDisplayLayerChromium : public LayerChromium {
|
| -public:
|
| - static scoped_refptr<HeadsUpDisplayLayerChromium> create();
|
| -
|
| - virtual void update(CCTextureUpdateQueue&, const CCOcclusionTracker*, CCRenderingStats&) OVERRIDE;
|
| - virtual bool drawsContent() const OVERRIDE;
|
| -
|
| - void setFontAtlas(scoped_ptr<CCFontAtlas>);
|
| -
|
| - virtual scoped_ptr<CCLayerImpl> createCCLayerImpl() OVERRIDE;
|
| - virtual void pushPropertiesTo(CCLayerImpl*) OVERRIDE;
|
| -
|
| -protected:
|
| - HeadsUpDisplayLayerChromium();
|
| -
|
| -private:
|
| - virtual ~HeadsUpDisplayLayerChromium();
|
| -
|
| - scoped_ptr<CCFontAtlas> m_fontAtlas;
|
| -};
|
| -
|
| -} // namespace cc
|
| -
|
| -#endif
|
| +// Temporary forwarding header
|
| +#include "cc/heads_up_display_layer.h"
|
|
|