Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1589)

Unified Diff: content/shell/browser/shell.h

Issue 1927463002: Rename gfx::Display/Screen to display::Display/Screen in content/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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 | « content/common/page_state_serialization.cc ('k') | content/shell/browser/shell_aura.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/shell/browser/shell.h
diff --git a/content/shell/browser/shell.h b/content/shell/browser/shell.h
index 547f3389830048756418dc5c6f6289549c3ff83c..590ccfd7247fb736a7e2eeb0e4dadf8f101ee266 100644
--- a/content/shell/browser/shell.h
+++ b/content/shell/browser/shell.h
@@ -25,6 +25,10 @@
namespace gfx {
class Screen;
}
+namespace display {
+using Screen = gfx::Screen;
+}
+
namespace wm {
class WMTestHelper;
}
@@ -249,7 +253,7 @@ class Shell : public WebContentsDelegate,
#elif defined(USE_AURA)
#if defined(OS_CHROMEOS)
static wm::WMTestHelper* wm_test_helper_;
- static gfx::Screen* test_screen_;
+ static display::Screen* test_screen_;
#endif
#if defined(TOOLKIT_VIEWS)
static views::ViewsDelegate* views_delegate_;
« no previous file with comments | « content/common/page_state_serialization.cc ('k') | content/shell/browser/shell_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698