Refactoring of SessionService to get componentized.

chrome/browser/sessions/session_types.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_SESSIONS_SESSION_TYPES_H_
 #define CHROME_BROWSER_SESSIONS_SESSION_TYPES_H_
 
 #include <algorithm>
 #include <string>
 #include <vector>
@@ skipping 91 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(SessionTab);
 };
 
 // SessionWindow -------------------------------------------------------------
 
 // Describes a saved window.
 struct SessionWindow {
   SessionWindow();
   ~SessionWindow();
 
+  // Possible window types which can be stored here.
+  enum WindowType {
+    TYPE_TABBED = 0,
+    TYPE_POPUP = 1
+  };
+
   // Convert this object into its sync protocol buffer equivalent. Note that
   // not all fields are synced here, because they don't all make sense or
   // translate when restoring a SessionWindow on another device.
   sync_pb::SessionWindow ToSyncData() const;
 
   // Identifier of the window.
   SessionID window_id;
 
   // Bounds of the window.
   gfx::Rect bounds;
 
   // Index of the selected tab in tabs; -1 if no tab is selected. After restore
   // this value is guaranteed to be a valid index into tabs.
   //
   // NOTE: when the service is creating SessionWindows, initially this
   // corresponds to SessionTab.tab_visual_index, not the index in
   // tabs. When done creating though, this is set to the index in
   // tabs.
   int selected_tab_index;
 
-  // Type of the browser. Currently we only store browsers of type
-  // TYPE_TABBED and TYPE_POPUP.
-  // This would be Browser::Type, but that would cause a circular dependency.

[Mr4D (OOO till 08-26), 2014/10/23 20:09:11]

Converted this into WindowType - decoupling from Browser specific code and
opening it for other types (required by athena). At the same time we are getting
rid of the untyped variable which cost me some grief to fiddle out.

-  int type;
+  // Type of the window. Note: This type is used to determine if the window gets
+  // saved or not.
+  // This would be SessionCommands::WindowType, but as long as this does not
+  // reside in a component, we keep it untyped.
+  WindowType type;
 
   // If true, the window is constrained.
   //
   // Currently SessionService prunes all constrained windows so that session
   // restore does not attempt to restore them.
   bool is_constrained;
 
   // Timestamp for when this window was last modified.
   base::Time timestamp;
 
   // The tabs, ordered by visual order.
   std::vector<SessionTab*> tabs;
 
   // Is the window maximized, minimized, or normal?
   ui::WindowShowState show_state;
 
   std::string app_name;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(SessionWindow);
 };
 
 #endif  // CHROME_BROWSER_SESSIONS_SESSION_TYPES_H_