content/browser/compositor/browser_compositor_view_mac.h - Issue 753933002: MacViews: Move content::AcceleratedWidget to new component, ui/accelerated_widget_mac

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/compositor/browser_compositor_view_mac.h

Issue 753933002: MacViews: Move content::AcceleratedWidget to new component, ui/accelerated_widget_mac (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@20141124-MacViews-MoveSoftwareLayerMac-fromcl

Patch Set: rebase to master Created 6 years, 1 month 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « content/browser/compositor/browser_compositor_ca_layer_tree_mac.mm ('k') | content/browser/compositor/browser_compositor_view_mac.mm » ('j') | content/browser/gpu/gpu_process_host_ui_shim.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/compositor/browser_compositor_view_mac.h

diff --git a/content/browser/compositor/browser_compositor_view_mac.h b/content/browser/compositor/browser_compositor_view_mac.h

index 013388d7e4fa73862880895a5be95c70febcdfb4..5db98ffe70980193dc4561095dc03039805aa70b 100644

--- a/content/browser/compositor/browser_compositor_view_mac.h

+++ b/content/browser/compositor/browser_compositor_view_mac.h

@@ -5,8 +5,8 @@

#ifndef CONTENT_BROWSER_COMPOSITOR_BROWSER_COMPOSITOR_VIEW_MAC_H_

#define CONTENT_BROWSER_COMPOSITOR_BROWSER_COMPOSITOR_VIEW_MAC_H_

-#include "content/browser/compositor/browser_compositor_ca_layer_tree_mac.h"

#include "ui/compositor/compositor.h"

+#include "ui/compositor/mac/accelerated_widget_mac.h"

namespace content {

@@ -23,14 +23,14 @@ class BrowserCompositorMac {

static void Recycle(scoped_ptr<BrowserCompositorMac> compositor);

ui::Compositor* compositor() { return &compositor_; }

- AcceleratedWidgetMac* accelerated_widget_mac() {

+ ui::AcceleratedWidgetMac* accelerated_widget_mac() {

return &accelerated_widget_mac_;

}

private:

BrowserCompositorMac();

- AcceleratedWidgetMac accelerated_widget_mac_;

+ ui::AcceleratedWidgetMac accelerated_widget_mac_;

ui::Compositor compositor_;

DISALLOW_COPY_AND_ASSIGN(BrowserCompositorMac);