Made DesktopEnvironment responsible for creation of the disconnect window.

remoting/host/disconnect_window_mac.mm

 // 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.
 
 #import <Cocoa/Cocoa.h>
 
 #import "remoting/host/disconnect_window_mac.h"
 
+#include "base/bind.h"
 #include "base/compiler_specific.h"
+#include "base/memory/weak_ptr.h"
 #include "base/string_util.h"
 #include "base/strings/sys_string_conversions.h"
-#include "remoting/host/disconnect_window.h"
+#include "remoting/host/client_session_control.h"
+#include "remoting/host/host_window.h"
 #include "remoting/host/ui_strings.h"
 
 @interface DisconnectWindowController()
 - (BOOL)isRToL;
 - (void)Hide;
 @end
 
+const int kMaximumConnectedNameWidthInPixels = 400;
+
 namespace remoting {
 
-class DisconnectWindowMac : public remoting::DisconnectWindow {
+class DisconnectWindowMac : public HostWindow {
  public:
-  explicit DisconnectWindowMac(const UiStrings* ui_strings);
+  explicit DisconnectWindowMac(const UiStrings& ui_strings);
   virtual ~DisconnectWindowMac();
 
-  virtual bool Show(const base::Closure& disconnect_callback,
-                    const std::string& username) OVERRIDE;
-  virtual void Hide() OVERRIDE;
+  // HostWindow overrides.
+  virtual void Start(
+      const base::WeakPtr<ClientSessionControl>& client_session_control)
+      OVERRIDE;
 
  private:
+  // Localized UI strings.
+  UiStrings ui_strings_;
+
   DisconnectWindowController* window_controller_;
 
-  // Points to the localized strings.
-  const UiStrings* ui_strings_;
-
   DISALLOW_COPY_AND_ASSIGN(DisconnectWindowMac);
 };
 
-DisconnectWindowMac::DisconnectWindowMac(const UiStrings* ui_strings)
-    : window_controller_(nil),
-      ui_strings_(ui_strings) {
+DisconnectWindowMac::DisconnectWindowMac(const UiStrings& ui_strings)
+    : ui_strings_(ui_strings),
+      window_controller_(NULL) {

[Sergey Ulanov, 2013/04/04 00:10:03]

s/NULL/nil/

[alexeypa (please no reviews), 2013/04/04 16:56:40]

Done.

 }
 
 DisconnectWindowMac::~DisconnectWindowMac() {
-  Hide();
-}
+  DCHECK(CalledOnValidThread());
 
-bool DisconnectWindowMac::Show(const base::Closure& disconnect_callback,
-                               const std::string& username) {
-  DCHECK(!disconnect_callback.is_null());
-  DCHECK(window_controller_ == nil);
-
-  window_controller_ =
-      [[DisconnectWindowController alloc] initWithUiStrings:ui_strings_
-                                                   callback:disconnect_callback
-                                                   username:username];
-  [window_controller_ showWindow:nil];
-  return true;
-}
-
-void DisconnectWindowMac::Hide() {
   // DisconnectWindowController is responsible for releasing itself in its
   // windowWillClose: method.
   [window_controller_ Hide];
   window_controller_ = nil;
 }
 
-scoped_ptr<DisconnectWindow> DisconnectWindow::Create(
-    const UiStrings* ui_strings) {
-  return scoped_ptr<DisconnectWindow>(new DisconnectWindowMac(ui_strings));
+void DisconnectWindowMac::Start(
+    const base::WeakPtr<ClientSessionControl>& client_session_control) {
+  DCHECK(CalledOnValidThread());
+  DCHECK(client_session_control);
+  DCHECK(!disconnect_window_);
+
+  // Create the window.
+  base::Closure disconnect_callback =
+      base::Bind(&ClientSessionControl::DisconnectSession,
+                 client_session_control);
+  std::string client_jid = client_session_control->client_jid();
+  std::string username = client_jid.substr(0, client_jid.find('/'));
+  window_controller_ =
+      [[DisconnectWindowController alloc] initWithUiStrings:&ui_strings_
+                                                   callback:disconnect_callback
+                                                   username:username];
+  [window_controller_ showWindow:nil];
+}
+
+// static
+scoped_ptr<HostWindow> HostWindow::CreateDisconnectWindow(
+    const UiStrings& ui_strings) {
+  return scoped_ptr<HostWindow>(new DisconnectWindowMac(ui_strings));
 }
 
 }  // namespace remoting
 
 @implementation DisconnectWindowController
 - (id)initWithUiStrings:(const remoting::UiStrings*)ui_strings
                callback:(const base::Closure&)disconnect_callback
                username:(const std::string&)username {
   self = [super initWithWindowNibName:@"disconnect_window"];
   if (self) {
@@ skipping 31 matching lines @@
   [disconnectButton_ setTitle:base::SysUTF16ToNSString(
       ui_strings_->disconnect_button_text)];
 
   // Resize the window dynamically based on the content.
   CGFloat oldConnectedWidth = NSWidth([connectedToField_ bounds]);
   [connectedToField_ sizeToFit];
   NSRect connectedToFrame = [connectedToField_ frame];
   CGFloat newConnectedWidth = NSWidth(connectedToFrame);
 
   // Set a max width for the connected to text field.
-  if (newConnectedWidth >
-      remoting::DisconnectWindow::kMaximumConnectedNameWidthInPixels) {
-    newConnectedWidth
-        = remoting::DisconnectWindow::kMaximumConnectedNameWidthInPixels;
+  if (newConnectedWidth > kMaximumConnectedNameWidthInPixels) {
+    newConnectedWidth = kMaximumConnectedNameWidthInPixels;
     connectedToFrame.size.width = newConnectedWidth;
     [connectedToField_ setFrame:connectedToFrame];
   }
 
   CGFloat oldDisconnectWidth = NSWidth([disconnectButton_ bounds]);
   [disconnectButton_ sizeToFit];
   NSRect disconnectFrame = [disconnectButton_ frame];
   CGFloat newDisconnectWidth = NSWidth(disconnectFrame);
 
   // Move the disconnect button appropriately.
@@ skipping 147 matching lines @@
   path = [NSBezierPath bezierPath];
   [path moveToPoint:top];
   [path lineToPoint:bottom];
   [light setStroke];
   [path stroke];
 
   [context setShouldAntialias:alias];
 }
 
 @end