Implement ShellWindow in Views.

chrome/browser/sync/engine/syncer.cc

Index: chrome/browser/sync/engine/syncer.cc
diff --git a/chrome/browser/sync/engine/syncer.cc b/chrome/browser/sync/engine/syncer.cc
index b906062e0e93c3d613d4f5551339e167431c2633..f6490c5831233111a556c58f75ee7ad812cce9b7 100644
--- a/chrome/browser/sync/engine/syncer.cc
+++ b/chrome/browser/sync/engine/syncer.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
 
@@ -144,8 +144,7 @@ void Syncer::SyncShare(sessions::SyncSession* session,
       }
       case DOWNLOAD_UPDATES: {
         DownloadUpdatesCommand download_updates;
-        session->mutable_status_controller()->set_last_download_updates_result(

[Mihai Parparita -not on Chrome, 2012/01/12 22:00:07]

Did you really mean to change this file? Merge error?

[jeremya, 2012/01/12 23:30:46]

Oops, that was a windows file handle brokenness thing on 'git checkout'. Fixed.

-            download_updates.Execute(session));
+        download_updates.Execute(session);
         next_step = PROCESS_CLIENT_COMMAND;
         break;
       }
@@ -223,17 +222,14 @@ void Syncer::SyncShare(sessions::SyncSession* session,
       }
       case POST_COMMIT_MESSAGE: {
         PostCommitMessageCommand post_commit_command;
-        session->mutable_status_controller()->set_last_post_commit_result(
-            post_commit_command.Execute(session));
+        post_commit_command.Execute(session);
         next_step = PROCESS_COMMIT_RESPONSE;
         break;
       }
       case PROCESS_COMMIT_RESPONSE: {
         session->mutable_status_controller()->reset_num_conflicting_commits();
         ProcessCommitResponseCommand process_response_command;
-        session->mutable_status_controller()->
-            set_last_process_commit_response_result(
-                process_response_command.Execute(session));
+        process_response_command.Execute(session);
         next_step = BUILD_AND_PROCESS_CONFLICT_SETS;
         break;
       }