Refactoring of SessionService to get componentized.

chrome/browser/extensions/api/sessions/sessions_api.cc

 // Copyright 2013 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/extensions/api/sessions/sessions_api.h"
 
 #include <vector>
 
 #include "base/i18n/rtl.h"
 #include "base/lazy_instance.h"
@@ skipping 271 matching lines @@
     tabs->push_back(make_linked_ptr(
         CreateTabModel(session_tag, *tabs_in_window[i], i,
                        window.selected_tab_index).release()));
   }
 
   std::string session_id =
       SessionId(session_tag, window.window_id.id()).ToString();
 
   windows::Window::Type type = windows::Window::TYPE_NONE;
   switch (window.type) {
-    case Browser::TYPE_TABBED:
+    case SessionWindow::TYPE_TABBED:
       type = windows::Window::TYPE_NORMAL;
       break;
-    case Browser::TYPE_POPUP:
+    case SessionWindow::TYPE_POPUP:
       type = windows::Window::TYPE_POPUP;
       break;
   }
 
   windows::Window::State state = windows::Window::STATE_NONE;
   switch (window.show_state) {
     case ui::SHOW_STATE_NORMAL:
       state = windows::Window::STATE_NORMAL;
       break;
     case ui::SHOW_STATE_MINIMIZED:
@@ skipping 341 matching lines @@
   return g_factory.Pointer();
 }
 
 void SessionsAPI::OnListenerAdded(const EventListenerInfo& details) {
   sessions_event_router_.reset(
       new SessionsEventRouter(Profile::FromBrowserContext(browser_context_)));
   EventRouter::Get(browser_context_)->UnregisterObserver(this);
 }
 
 }  // namespace extensions