chrome/browser/extensions/api/system_display/system_display_apitest.cc - Issue 138003007: [Cleanup] Screen cleanup

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: chrome/browser/extensions/api/system_display/system_display_apitest.cc

Issue 138003007: [Cleanup] Screen cleanup (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix conflict 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 side-by-side diff with in-line comments

Download patch

« ash/shell.cc ('K') | « chrome/browser/extensions/api/system_display/display_info_provider_chromeos_unittest.cc ('k') | chrome/browser/extensions/api/system_info/system_info_api.cc » ('j') | chrome/browser/extensions/api/system_info/system_info_api.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/system_display/system_display_apitest.cc

diff --git a/chrome/browser/extensions/api/system_display/system_display_apitest.cc b/chrome/browser/extensions/api/system_display/system_display_apitest.cc

index 57c741d580ae1ed91ec1e3a8e4f931a09ff058d4..17a0dcf1182fb9254755c14fd083490d9bb191b8 100644

--- a/chrome/browser/extensions/api/system_display/system_display_apitest.cc

+++ b/chrome/browser/extensions/api/system_display/system_display_apitest.cc

@@ -14,7 +14,7 @@

#include "ui/gfx/screen.h"

#if defined(OS_CHROMEOS)

-#include "ash/screen_ash.h"

+#include "ash/display/screen_ash.h"

#include "ash/shell.h"

#endif

@@ -185,7 +185,7 @@ class SystemDisplayApiTest: public ExtensionApiTest {

virtual void CleanUpOnMainThread() OVERRIDE {

#if defined(OS_CHROMEOS)

gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE,

- ash::Shell::GetInstance()->screen());

+ ash::Shell::GetScreen());

Jun Mukai 2014/01/15 19:20:15 Doesn't it fit into the previous line?

oshima 2014/01/15 19:42:51 nope (85 chars)

#endif

ExtensionApiTest::CleanUpOnMainThread();

}