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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/shell.cc

Issue 11146023: Work on separate browser contexts (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: remove unrelated change Created 8 years, 2 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 | « no previous file | chrome/app/chrome_dll.rc » ('j') | chrome/browser/ui/views/chrome_views_delegate.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shell.cc
diff --git a/ash/shell.cc b/ash/shell.cc
index 90036a98bed4e25f7c8b72d4232fbff2b70129cc..8993df4ff1f214be00833e8cc14988391441a58a 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -186,7 +186,6 @@ Shell::Shell(ShellDelegate* delegate)
#endif // defined(OS_CHROMEOS)
browser_context_(NULL),
simulate_modal_window_open_for_testing_(false) {
- gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, screen_.get());
gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_ALTERNATE, screen_.get());
ui_controls::InstallUIControlsAura(internal::CreateUIControls());
#if defined(OS_CHROMEOS)
@@ -324,7 +323,7 @@ aura::RootWindow* Shell::GetActiveRootWindow() {
// static
gfx::Screen* Shell::GetScreen() {
- return gfx::Screen::GetScreenFor(GetPrimaryRootWindow());
+ return gfx::Screen::GetScreenByType(gfx::SCREEN_TYPE_ALTERNATE);
}
// static
« no previous file with comments | « no previous file | chrome/app/chrome_dll.rc » ('j') | chrome/browser/ui/views/chrome_views_delegate.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698