Convert WindowOpenDisposition to an enum class.

components/sessions/core/tab_restore_service_helper.cc

 // Copyright 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 "components/sessions/core/tab_restore_service_helper.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <iterator>
@@ skipping 111 matching lines @@
 }
 
 const TabRestoreService::Entries& TabRestoreServiceHelper::entries() const {
   return entries_;
 }
 
 std::vector<LiveTab*> TabRestoreServiceHelper::RestoreMostRecentEntry(
     LiveTabContext* context) {
   if (entries_.empty())
     return std::vector<LiveTab*>();
-  return RestoreEntryById(context, entries_.front()->id, UNKNOWN);
+  return RestoreEntryById(context, entries_.front()->id,
+                          WindowOpenDisposition::UNKNOWN);
 }
 
 std::unique_ptr<TabRestoreService::Tab>
 TabRestoreServiceHelper::RemoveTabEntryById(SessionID::id_type id) {
   auto it = GetEntryIteratorById(id);
   if (it == entries_.end())
     return nullptr;
 
   if ((*it)->type != TabRestoreService::TAB)
     return nullptr;
@@ skipping 92 matching lines @@
             UpdateTabBrowserIDs(restored_tab_browser_id,
                                 context->GetSessionID().id());
             for (auto& tab_j : window.tabs)
               tab_j->browser_id = context->GetSessionID().id();
           }
           break;
         }
       }
       context->ShowBrowserWindow();
 
-      if (disposition == CURRENT_TAB && current_context &&
-          current_context->GetActiveLiveTab()) {
+      if (disposition == WindowOpenDisposition::CURRENT_TAB &&
+          current_context && current_context->GetActiveLiveTab()) {
         current_context->CloseTab();
       }
       break;
     }
   }
 
   if (!restoring_tab_in_window) {
     entries_.erase(entry_iterator);
   }
 
@@ skipping 109 matching lines @@
     tab->pinned = context->IsTabPinned(tab->tabstrip_index);
   }
 }
 
 LiveTabContext* TabRestoreServiceHelper::RestoreTab(
     const Tab& tab,
     LiveTabContext* context,
     WindowOpenDisposition disposition,
     LiveTab** live_tab) {
   LiveTab* restored_tab;
-  if (disposition == CURRENT_TAB && context) {
+  if (disposition == WindowOpenDisposition::CURRENT_TAB && context) {
     restored_tab = context->ReplaceRestoredTab(
         tab.navigations, tab.current_navigation_index, tab.from_last_session,
         tab.extension_app_id, tab.platform_data.get(), tab.user_agent_override);
   } else {
     // We only respsect the tab's original browser if there's no disposition.
-    if (disposition == UNKNOWN && tab.browser_id) {
+    if (disposition == WindowOpenDisposition::UNKNOWN && tab.browser_id) {
       context = client_->FindLiveTabContextWithID(tab.browser_id);
     }
 
     int tab_index = -1;
 
     // |context| will be NULL in cases where one isn't already available (eg,
     // when invoked on Mac OS X with no windows open). In this case, create a
     // new browser into which we restore the tabs.
-    if (context && disposition != NEW_WINDOW) {
+    if (context && disposition != WindowOpenDisposition::NEW_WINDOW) {
       tab_index = tab.tabstrip_index;
     } else {
       context = client_->CreateLiveTabContext(std::string());
       if (tab.browser_id)
         UpdateTabBrowserIDs(tab.browser_id, context->GetSessionID().id());
     }
 
     // Place the tab at the end if the tab index is no longer valid or
     // we were passed a specific disposition.
     if (tab_index < 0 || tab_index > context->GetTabCount() ||
-        disposition != UNKNOWN) {
+        disposition != WindowOpenDisposition::UNKNOWN) {
       tab_index = context->GetTabCount();
     }
 
     restored_tab = context->AddRestoredTab(
         tab.navigations, tab_index, tab.current_navigation_index,
-        tab.extension_app_id, disposition != NEW_BACKGROUND_TAB, tab.pinned,
+        tab.extension_app_id,
+        disposition != WindowOpenDisposition::NEW_BACKGROUND_TAB, tab.pinned,
         tab.from_last_session, tab.platform_data.get(),
         tab.user_agent_override);
     restored_tab->LoadIfNecessary();
   }
   client_->OnTabRestored(
       tab.navigations.at(tab.current_navigation_index).virtual_url());
   if (live_tab)
     *live_tab = restored_tab;
 
   return context;
@@ skipping 63 matching lines @@
         tab.browser_id = new_id;
     }
   }
 }
 
 base::Time TabRestoreServiceHelper::TimeNow() const {
   return time_factory_ ? time_factory_->TimeNow() : base::Time::Now();
 }
 
 }  // namespace sessions