Merge 199540 "Fixes couple of bugs triggered on chromeos when re..."

chrome/browser/sessions/tab_restore_service_helper.h

 // 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.
 
 #ifndef CHROME_BROWSER_SESSIONS_TAB_RESTORE_SERVICE_HELPER_H_
 #define CHROME_BROWSER_SESSIONS_TAB_RESTORE_SERVICE_HELPER_H_
 
 #include <set>
 
 #include "base/basictypes.h"
@@ skipping 72 matching lines @@
                               chrome::HostDesktopType host_desktop_type);
   Tab* RemoveTabEntryById(SessionID::id_type id);
   void RestoreEntryById(TabRestoreServiceDelegate* delegate,
                         SessionID::id_type id,
                         chrome::HostDesktopType host_desktop_type,
                         WindowOpenDisposition disposition);
 
   // Notifies observers the tabs have changed.
   void NotifyTabsChanged();
 
+  // Notifies observers the service has loaded.
+  void NotifyLoaded();
+
   // Adds |entry| to the list of entries and takes ownership. If |prune| is true
   // |PruneAndNotify| is invoked. If |to_front| is true the entry is added to
   // the front, otherwise the back. Normal closes go to the front, but
   // tab/window closes from the previous session are added to the back.
   void AddEntry(Entry* entry, bool prune, bool to_front);
 
   // Prunes |entries_| to contain only kMaxEntries, and removes uninteresting
   // entries.
   void PruneEntries();
 
@@ skipping 73 matching lines @@
   // corresponding BrowserClosed. We cache the set of delegates closing to
   // avoid creating historical tabs for them.
   std::set<TabRestoreServiceDelegate*> closing_delegates_;
 
   TimeFactory* const time_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(TabRestoreServiceHelper);
 };
 
 #endif  // CHROME_BROWSER_SESSIONS_TAB_RESTORE_SERVICE_HELPER_H_