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

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

Issue 1548133002: Switch to standard integer types in chrome/browser/, part 3 of 4. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 12 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
« no previous file with comments | « chrome/browser/sessions/tab_restore_browsertest.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/tab_restore_service_factory.h" 5 #include "chrome/browser/sessions/tab_restore_service_factory.h"
6 6
7 #include "build/build_config.h"
7 #include "chrome/browser/profiles/profile.h" 8 #include "chrome/browser/profiles/profile.h"
8 #include "chrome/browser/sessions/chrome_tab_restore_service_client.h" 9 #include "chrome/browser/sessions/chrome_tab_restore_service_client.h"
9 #include "components/keyed_service/content/browser_context_dependency_manager.h" 10 #include "components/keyed_service/content/browser_context_dependency_manager.h"
10 11
11 #if defined(OS_ANDROID) 12 #if defined(OS_ANDROID)
12 #include "components/sessions/core/in_memory_tab_restore_service.h" 13 #include "components/sessions/core/in_memory_tab_restore_service.h"
13 #else 14 #else
14 #include "components/sessions/core/persistent_tab_restore_service.h" 15 #include "components/sessions/core/persistent_tab_restore_service.h"
15 #endif 16 #endif
16 17
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 DCHECK(!profile->IsOffTheRecord()); 58 DCHECK(!profile->IsOffTheRecord());
58 scoped_ptr<sessions::TabRestoreServiceClient> client( 59 scoped_ptr<sessions::TabRestoreServiceClient> client(
59 new ChromeTabRestoreServiceClient(profile)); 60 new ChromeTabRestoreServiceClient(profile));
60 61
61 #if defined(OS_ANDROID) 62 #if defined(OS_ANDROID)
62 return new sessions::InMemoryTabRestoreService(client.Pass(), nullptr); 63 return new sessions::InMemoryTabRestoreService(client.Pass(), nullptr);
63 #else 64 #else
64 return new sessions::PersistentTabRestoreService(client.Pass(), nullptr); 65 return new sessions::PersistentTabRestoreService(client.Pass(), nullptr);
65 #endif 66 #endif
66 } 67 }
OLDNEW
« no previous file with comments | « chrome/browser/sessions/tab_restore_browsertest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698