ash/desktop_background/desktop_background_view.h - Issue 2200893002: mash: Partially migrate ash/desktop_background to ash common types.

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: ash/desktop_background/desktop_background_view.h

Issue 2200893002: mash: Partially migrate ash/desktop_background to ash common types. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix mash browser test crash in GetMaxDisplaySizeInNative. Created 4 years, 4 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « ash/desktop_background/desktop_background_controller_unittest.cc ('k') | ash/desktop_background/desktop_background_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ash/desktop_background/desktop_background_view.h

diff --git a/ash/desktop_background/desktop_background_view.h b/ash/desktop_background/desktop_background_view.h

index fdb2106db2803b869ab6357cf6a532ba72166290..7d2335c427d8c5d39120847417ad4a82830c7954 100644

--- a/ash/desktop_background/desktop_background_view.h

+++ b/ash/desktop_background/desktop_background_view.h

@@ -7,15 +7,13 @@

#include <memory>

-#include "base/macros.h"

-#include "ui/events/event.h"

-#include "ui/gfx/image/image_skia.h"

#include "ui/views/context_menu_controller.h"

#include "ui/views/view.h"

namespace ash {

class PreEventDispatchHandler;

+class WmWindow;

class DesktopBackgroundView : public views::View,

public views::ContextMenuController {

@@ -39,6 +37,8 @@ class DesktopBackgroundView : public views::View,

DISALLOW_COPY_AND_ASSIGN(DesktopBackgroundView);

};

+views::Widget* CreateDesktopBackground(WmWindow* root_window, int container_id);

} // namespace ash

#endif // ASH_DESKTOP_BACKGROUND_DESKTOP_BACKGROUND_VIEW_H_