| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/sessions/session_restore.h" | 5 #include "chrome/browser/sessions/session_restore.h" |
| 6 | 6 |
| 7 #include <vector> | 7 #include <vector> |
| 8 | 8 |
| 9 #include "chrome/browser/android/tab_android.h" | 9 #include "chrome/browser/android/tab_android.h" |
| 10 #include "chrome/browser/profiles/profile.h" | 10 #include "chrome/browser/profiles/profile.h" |
| (...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 51 disposition == NEW_BACKGROUND_TAB); | 51 disposition == NEW_BACKGROUND_TAB); |
| 52 tab_model->CreateTab(current_tab, new_web_contents, | 52 tab_model->CreateTab(current_tab, new_web_contents, |
| 53 current_tab->GetAndroidId()); | 53 current_tab->GetAndroidId()); |
| 54 } | 54 } |
| 55 return new_web_contents; | 55 return new_web_contents; |
| 56 } | 56 } |
| 57 | 57 |
| 58 // static | 58 // static |
| 59 std::vector<Browser*> SessionRestore::RestoreForeignSessionWindows( | 59 std::vector<Browser*> SessionRestore::RestoreForeignSessionWindows( |
| 60 Profile* profile, | 60 Profile* profile, |
| 61 chrome::HostDesktopType host_desktop_type, | |
| 62 std::vector<const sessions::SessionWindow*>::const_iterator begin, | 61 std::vector<const sessions::SessionWindow*>::const_iterator begin, |
| 63 std::vector<const sessions::SessionWindow*>::const_iterator end) { | 62 std::vector<const sessions::SessionWindow*>::const_iterator end) { |
| 64 NOTREACHED(); | 63 NOTREACHED(); |
| 65 return std::vector<Browser*>(); | 64 return std::vector<Browser*>(); |
| 66 } | 65 } |
| OLD | NEW |