Refactoring of SessionService to get componentized.

chrome/browser/sessions/session_types.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 "chrome/browser/sessions/session_types.h"
 
 #include "base/basictypes.h"
 #include "base/stl_util.h"
 #include "chrome/browser/sessions/session_command.h"
 #include "chrome/browser/ui/browser.h"
@@ skipping 41 matching lines @@
            it = navigations.begin(); it != navigations.end(); ++it) {
     *sync_data.add_navigation() = it->ToSyncData();
   }
   return sync_data;
 }
 
 // SessionWindow ---------------------------------------------------------------
 
 SessionWindow::SessionWindow()
     : selected_tab_index(-1),
-      type(Browser::TYPE_TABBED),
+      type(TYPE_TABBED),
       is_constrained(true),
       show_state(ui::SHOW_STATE_DEFAULT) {
 }
 
 SessionWindow::~SessionWindow() {
   STLDeleteElements(&tabs);
 }
 
 sync_pb::SessionWindow SessionWindow::ToSyncData() const {
   sync_pb::SessionWindow sync_data;
   sync_data.set_window_id(window_id.id());
   sync_data.set_selected_tab_index(selected_tab_index);
   switch (type) {
-    case Browser::TYPE_TABBED:
+    case SessionWindow::TYPE_TABBED:
       sync_data.set_browser_type(
           sync_pb::SessionWindow_BrowserType_TYPE_TABBED);
       break;
-    case Browser::TYPE_POPUP:
+    case SessionWindow::TYPE_POPUP:
       sync_data.set_browser_type(
         sync_pb::SessionWindow_BrowserType_TYPE_POPUP);
       break;
     default:
       NOTREACHED() << "Unhandled browser type.";
   }
 
   for (size_t i = 0; i < tabs.size(); i++)
     sync_data.add_tab(tabs[i]->tab_id.id());
 
   return sync_data;
 }