Rename GetRootWindow() -> GetPrimaryRootWindow()

chrome/browser/ui/views/ash/key_rewriter.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 "chrome/browser/ui/views/ash/key_rewriter.h"
 
 #include <vector>
 
 #include "ash/shell.h"
 #include "base/logging.h"
@@ skipping 15 matching lines @@
 
 namespace {
 
 const int kBadDeviceId = -1;
 
 }  // namespace
 
 KeyRewriter::KeyRewriter() : last_device_id_(kBadDeviceId) {
   // The ash shell isn't instantiated for our unit tests.
   if (ash::Shell::HasInstance())
-    ash::Shell::GetInstance()->GetRootWindow()->AddRootWindowObserver(this);
+    ash::Shell::GetPrimaryRootWindow()->AddRootWindowObserver(this);
 #if defined(OS_CHROMEOS)
   if (base::chromeos::IsRunningOnChromeOS()) {
     chromeos::XInputHierarchyChangedEventListener::GetInstance()
         ->AddObserver(this);
   }
   RefreshKeycodes();
 #endif
 }
 
 KeyRewriter::~KeyRewriter() {
   if (ash::Shell::HasInstance())
-    ash::Shell::GetInstance()->GetRootWindow()->RemoveRootWindowObserver(this);
+    ash::Shell::GetPrimaryRootWindow()->RemoveRootWindowObserver(this);
 #if defined(OS_CHROMEOS)
   if (base::chromeos::IsRunningOnChromeOS()) {
     chromeos::XInputHierarchyChangedEventListener::GetInstance()
         ->RemoveObserver(this);
   }
 #endif
 }
 
 KeyRewriter::DeviceType KeyRewriter::DeviceAddedForTesting(
     int device_id,
@@ skipping 280 matching lines @@
   const DeviceType type = KeyRewriter::GetDeviceType(device_name);
   if (type == kDeviceAppleKeyboard) {
     VLOG(1) << "Apple keyboard '" << device_name << "' connected: "
             << "id=" << device_id;
   }
   // Always overwrite the existing device_id since the X server may reuse a
   // device id for an unattached device.
   device_id_to_type_[device_id] = type;
   return type;
 }