Reworked the plumbing required to pass the client resolution to the desktop resizer.

remoting/host/resizing_host_observer.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 "remoting/host/resizing_host_observer.h"
 
 #include <list>
 
 #include "base/logging.h"
 #include "remoting/host/desktop_resizer.h"
+#include "remoting/host/screen_resolution.h"
 
 namespace {
 
 class CandidateSize {
  public:
   CandidateSize(const SkISize& candidate, const SkISize& preferred)
       : size_(candidate) {
     // Protect against division by zero.
     CHECK(!candidate.isEmpty());
     DCHECK(!preferred.isEmpty());
@@ skipping 80 matching lines @@
     scoped_ptr<DesktopResizer> desktop_resizer)
     : desktop_resizer_(desktop_resizer.Pass()),
       original_size_(desktop_resizer_->GetCurrentSize()) {
 }
 
 ResizingHostObserver::~ResizingHostObserver() {
   if (!original_size_.isZero())
     desktop_resizer_->RestoreSize(original_size_);
 }
 
-void ResizingHostObserver::OnClientResolutionChanged(
-    const SkIPoint& client_dpi,
-    const SkISize& client_size) {
-  if (client_size.isEmpty()) {
+void ResizingHostObserver::SetScreenResolution(
+    const ScreenResolution& resolution) {
+  if (resolution.IsNull())
     return;
-  }
 
   // If the implementation returns any sizes, pick the best one according to
   // the algorithm described in CandidateSize::IsBetterThen.
   std::list<SkISize> sizes =
-      desktop_resizer_->GetSupportedSizes(client_size);
+      desktop_resizer_->GetSupportedSizes(resolution.dimensions_);
   if (sizes.empty()) {
     return;
   }
-  CandidateSize best_size(sizes.front(), client_size);
+  CandidateSize best_size(sizes.front(), resolution.dimensions_);
   for (std::list<SkISize>::const_iterator i = ++sizes.begin();
        i != sizes.end(); ++i) {
-    CandidateSize candidate_size(*i, client_size);
+    CandidateSize candidate_size(*i, resolution.dimensions_);
     if (candidate_size.IsBetterThan(best_size)) {
       best_size = candidate_size;
     }
   }
   SkISize current_size = desktop_resizer_->GetCurrentSize();
   if (best_size.size() != current_size)
     desktop_resizer_->SetSize(best_size.size());
 }
 
 }  // namespace remoting