Upstream session_backend_android.

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/string_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "content/public/browser/navigation_controller.h"
@@ skipping 111 matching lines @@
 
 SessionTab::SessionTab()
     : tab_visual_index(-1),
       current_navigation_index(-1),
       pinned(false) {
 }
 
 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()
     : selected_tab_index(-1),
       type(Browser::TYPE_TABBED),
       is_constrained(true),
       show_state(ui::SHOW_STATE_DEFAULT) {
 }
 
 SessionWindow::~SessionWindow() {
   STLDeleteElements(&tabs);
 }