Make Browser aware of HostDesktopType.

chrome/browser/ui/browser.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_BROWSER_H_
 #define CHROME_BROWSER_UI_BROWSER_H_
 
 #include <map>
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/string16.h"
 #include "chrome/browser/debugger/devtools_toggle_action.h"
 #include "chrome/browser/event_disposition.h"
 #include "chrome/browser/prefs/pref_change_registrar.h"
 #include "chrome/browser/prefs/pref_member.h"
 #include "chrome/browser/sessions/session_id.h"
 #include "chrome/browser/ui/blocked_content/blocked_content_tab_helper_delegate.h"
 #include "chrome/browser/ui/bookmarks/bookmark_bar.h"
 #include "chrome/browser/ui/bookmarks/bookmark_tab_helper_delegate.h"
 #include "chrome/browser/ui/browser_navigator.h"
 #include "chrome/browser/ui/constrained_window_tab_helper_delegate.h"
+#include "chrome/browser/ui/host_desktop.h"
 #include "chrome/browser/ui/search_engines/search_engine_tab_helper_delegate.h"
 #include "chrome/browser/ui/tab_contents/core_tab_helper_delegate.h"
 #include "chrome/browser/ui/tabs/tab_strip_model_observer.h"
 #include "chrome/browser/ui/toolbar/toolbar_model.h"
 #include "chrome/browser/ui/zoom/zoom_observer.h"
 #include "chrome/common/content_settings.h"
 #include "chrome/common/content_settings_types.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/page_navigator.h"
@@ skipping 112 matching lines @@
 
     // There are active downloads associated with this incognito profile
     // that would be canceled.
     DOWNLOAD_CLOSE_LAST_WINDOW_IN_INCOGNITO_PROFILE,
   };
 
   struct CreateParams {
     CreateParams();
     explicit CreateParams(Profile* profile);
     CreateParams(Type type, Profile* profile);
+    CreateParams(Type type,
+                 Profile* profile,
+                 chrome::HostDesktopType host_desktop_type);
 
     static CreateParams CreateForApp(Type type,
                                      const std::string& app_name,
                                      const gfx::Rect& window_bounds,
                                      Profile* profile);
 
     static CreateParams CreateForDevTools(Profile* profile);
 
     // The browser type.
     Type type;
 
     // The associated profile.
     Profile* profile;
 
+    // On which host desktop is the browser is created.

[robertshield, 2012/08/10 14:17:30]

nit: // The host desktop the browser is created on.

[MAD, 2012/08/10 14:55:42]

Done.

+    chrome::HostDesktopType host_desktop_type;
+
     // The application name that is also the name of the window to the shell.
     // This name should be set when:
     // 1) we launch an application via an application shortcut or extension API.
     // 2) we launch an undocked devtool window.
     std::string app_name;
 
     // Type of app (host or child). See description of AppType.
     AppType app_type;
 
     // The bounds of the window to open.
@@ skipping 27 matching lines @@
   }
   // Set indicator that this browser is being created via session restore.
   // This is used on the Mac (only) to determine animation style when the
   // browser window is shown.
   void set_is_session_restore(bool is_session_restore) {
     is_session_restore_ = is_session_restore;
   }
   bool is_session_restore() const {
     return is_session_restore_;
   }
+  chrome::HostDesktopType host_desktop_type() {
+    return host_desktop_type_;
+  };
 
   // Accessors ////////////////////////////////////////////////////////////////
 
   Type type() const { return type_; }
   const std::string& app_name() const { return app_name_; }
   AppType app_type() const { return app_type_; }
   Profile* profile() const { return profile_; }
   gfx::Rect override_bounds() const { return override_bounds_; }
 
   // |window()| will return NULL if called before |CreateBrowserWindow()|
@@ skipping 624 matching lines @@
   // These are supplied by callers that don't want to use the default values.
   // The default values are typically loaded from local state (last session),
   // obtained from the last window of the same type, or obtained from the
   // shell shortcut's startup info.
   gfx::Rect override_bounds_;
   ui::WindowShowState initial_show_state_;
 
   // Tracks when this browser is being created by session restore.
   bool is_session_restore_;
 
+  chrome::HostDesktopType host_desktop_type_;
+
   scoped_ptr<chrome::UnloadController> unload_controller_;
 
   // The following factory is used to close the frame at a later time.
   base::WeakPtrFactory<Browser> weak_factory_;
 
   // The Find Bar. This may be NULL if there is no Find Bar, and if it is
   // non-NULL, it may or may not be visible.
   scoped_ptr<FindBarController> find_bar_controller_;
 
   // Dialog box used for opening and saving files.
@@ skipping 35 matching lines @@
   bool window_has_shown_;
 
   // Currently open color chooser. Non-NULL after OpenColorChooser is called and
   // before DidEndColorChooser is called.
   scoped_ptr<content::ColorChooser> color_chooser_;
 
   DISALLOW_COPY_AND_ASSIGN(Browser);
 };
 
 #endif  // CHROME_BROWSER_UI_BROWSER_H_