Work on separate browser contexts

ash/shell.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/shell.h"
 
 #include <algorithm>
 #include <string>
 
 #include "ash/accelerators/focus_manager_factory.h"
@@ skipping 172 matching lines @@
       active_root_window_(NULL),
       delegate_(delegate),
 #if defined(OS_CHROMEOS)
       output_configurator_(new chromeos::OutputConfigurator()),
       output_configurator_animation_(
           new internal::OutputConfiguratorAnimation()),
 #endif  // defined(OS_CHROMEOS)
       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)
   content::GpuFeatureType blacklisted_features =
       content::GpuDataManager::GetInstance()->GetBlacklistedFeatures();
   bool is_panel_fitting_disabled =
       (blacklisted_features & content::GPU_FEATURE_TYPE_PANEL_FITTING) ||
       CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kAshDisablePanelFitting);
   output_configurator_->Init(!is_panel_fitting_disabled);
@@ skipping 118 matching lines @@
   return GetInstance()->display_controller()->GetPrimaryRootWindow();
 }
 
 // static
 aura::RootWindow* Shell::GetActiveRootWindow() {
   return GetInstance()->active_root_window_;
 }
 
 // static
 gfx::Screen* Shell::GetScreen() {
-  return gfx::Screen::GetScreenFor(GetPrimaryRootWindow());
+  return gfx::Screen::GetScreenByType(gfx::SCREEN_TYPE_ALTERNATE);
 }
 
 // static
 Shell::RootWindowList Shell::GetAllRootWindows() {
   return Shell::GetInstance()->display_controller()->
       GetAllRootWindows();
 }
 
 // static
 aura::Window* Shell::GetContainer(aura::RootWindow* root_window,
@@ skipping 425 matching lines @@
        iter != controllers.end(); ++iter) {
     if ((*iter)->GetSystemModalLayoutManager(window)->
             CanWindowReceiveEvents(window)) {
       return true;
     }
   }
   return false;
 }
 
 }  // namespace ash