content/shell/browser/shell.h - Issue 2207043002: SetDeviceScaleFactorForTest

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/shell/browser/shell.h

Issue 2207043002: SetDeviceScaleFactorForTest Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: SetDeviceScaleFactorForTest 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:

Index: content/shell/browser/shell.h

diff --git a/content/shell/browser/shell.h b/content/shell/browser/shell.h

index bbf44ca31b1ed58fe0878bf77cb7946f8cb87055..6b375da7cce1273d0d999f3518d8b4e9101f9a7e 100644

--- a/content/shell/browser/shell.h

+++ b/content/shell/browser/shell.h

@@ -243,14 +243,10 @@ class Shell : public WebContentsDelegate,

#if defined(OS_ANDROID)

base::android::ScopedJavaGlobalRef<jobject> java_object_;

-#elif defined(USE_AURA)

-#if defined(OS_CHROMEOS)

- static wm::WMTestHelper* wm_test_helper_;

- static display::Screen* test_screen_;

#endif

-#if defined(TOOLKIT_VIEWS)

- static views::ViewsDelegate* views_delegate_;

+#if defined(USE_AURA)

+#if defined(TOOLKIT_VIEWS)

views::Widget* window_widget_;

#endif // defined(TOOLKIT_VIEWS)

static ShellPlatformDataAura* platform_;