Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(795)

Side by Side Diff: chrome/browser/sessions/session_restore_android.cc

Issue 1336823003: Move chrome::HostDesktopType to ui::HostDesktopType (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@base_session_service_delegate_impl
Patch Set: Fix build on Mac and CrOS Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 "base/memory/scoped_vector.h" 9 #include "base/memory/scoped_vector.h"
10 #include "chrome/browser/android/tab_android.h" 10 #include "chrome/browser/android/tab_android.h"
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 DCHECK(disposition == NEW_FOREGROUND_TAB || 51 DCHECK(disposition == NEW_FOREGROUND_TAB ||
52 disposition == NEW_BACKGROUND_TAB); 52 disposition == NEW_BACKGROUND_TAB);
53 tab_model->CreateTab(new_web_contents, current_tab->GetAndroidId()); 53 tab_model->CreateTab(new_web_contents, 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, 61 ui::HostDesktopType host_desktop_type,
62 std::vector<const sessions::SessionWindow*>::const_iterator begin, 62 std::vector<const sessions::SessionWindow*>::const_iterator begin,
63 std::vector<const sessions::SessionWindow*>::const_iterator end) { 63 std::vector<const sessions::SessionWindow*>::const_iterator end) {
64 NOTREACHED(); 64 NOTREACHED();
65 return std::vector<Browser*>(); 65 return std::vector<Browser*>();
66 } 66 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698