Upstream session_backend_android.

chrome/browser/sessions/session_types.cc

Index: chrome/browser/sessions/session_types.cc
diff --git a/chrome/browser/sessions/session_types.cc b/chrome/browser/sessions/session_types.cc
index 5691f8d635ce2e50f17356e1ec7168dc5124c04a..908380821d52f5ce8a589618f0b65ca700a4ff84 100644
--- a/chrome/browser/sessions/session_types.cc
+++ b/chrome/browser/sessions/session_types.cc
@@ -129,6 +129,17 @@ SessionTab::SessionTab()
 SessionTab::~SessionTab() {
 }
 
+int SessionTab::NormalizedNavigationIndex() const {
+  int selected_index = this->current_navigation_index;
+  // Bounds checking. Lowest value allowed is 0, so we need to check for max if
+  // navigations.size() == 0 or if selected_index is negative.
+  selected_index = std::max(

[sky, 2012/08/03 17:21:39]

Combine all this into a single return, eg:

return std::max(0,
                std::min(current_navigation_index,
                         static_cast<...

Don't use this-> here.

And move the implementation to the header and name it:
normlized_navigation_index()

[felipeg, 2012/08/06 16:54:53]

Done.

+      0,
+      std::min(selected_index,
+               static_cast<int>(this->navigations.size() - 1)));
+  return selected_index;
+}
+
 // SessionWindow ---------------------------------------------------------------
 
 SessionWindow::SessionWindow()