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

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: another busted command line flag 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') | no next file with comments »
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 2ceb23f41c1f8c013c58250b5bf6d8e8587941b3..aee6b2cb956cc87b7ccd222adfaca188289b2f64 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -190,7 +190,6 @@ Shell::Shell(ShellDelegate* delegate)
browser_context_(NULL),
simulate_modal_window_open_for_testing_(false) {
ANNOTATE_LEAKING_OBJECT_PTR(screen_); // see crbug.com/156466
- gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, screen_);
gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_ALTERNATE, screen_);
ui_controls::InstallUIControlsAura(internal::CreateUIControls());
#if defined(OS_CHROMEOS)
@@ -329,7 +328,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') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698