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

Side by Side Diff: chrome/browser/ui/android/tab_model/tab_model.h

Issue 1865213004: Convert //chrome/browser/ui from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 8 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 #ifndef CHROME_BROWSER_UI_ANDROID_TAB_MODEL_TAB_MODEL_H_ 5 #ifndef CHROME_BROWSER_UI_ANDROID_TAB_MODEL_TAB_MODEL_H_
6 #define CHROME_BROWSER_UI_ANDROID_TAB_MODEL_TAB_MODEL_H_ 6 #define CHROME_BROWSER_UI_ANDROID_TAB_MODEL_TAB_MODEL_H_
7 7
8 #include <memory>
9
8 #include "base/macros.h" 10 #include "base/macros.h"
9 #include "base/memory/scoped_ptr.h"
10 #include "components/sessions/core/session_id.h" 11 #include "components/sessions/core/session_id.h"
11 #include "components/sync_sessions/synced_window_delegate.h" 12 #include "components/sync_sessions/synced_window_delegate.h"
12 #include "components/toolbar/toolbar_model.h" 13 #include "components/toolbar/toolbar_model.h"
13 #include "components/toolbar/toolbar_model_delegate.h" 14 #include "components/toolbar/toolbar_model_delegate.h"
14 #include "content/public/browser/notification_observer.h" 15 #include "content/public/browser/notification_observer.h"
15 #include "content/public/browser/notification_registrar.h" 16 #include "content/public/browser/notification_registrar.h"
16 17
17 namespace browser_sync { 18 namespace browser_sync {
18 class SyncedWindowDelegate; 19 class SyncedWindowDelegate;
19 class SyncedWindowDelegateAndroid; 20 class SyncedWindowDelegateAndroid;
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
74 const content::NotificationSource& source, 75 const content::NotificationSource& source,
75 const content::NotificationDetails& details) override; 76 const content::NotificationDetails& details) override;
76 77
77 // The profile associated with this TabModel. 78 // The profile associated with this TabModel.
78 Profile* profile_; 79 Profile* profile_;
79 80
80 // Describes if this TabModel contains an off-the-record profile. 81 // Describes if this TabModel contains an off-the-record profile.
81 bool is_off_the_record_; 82 bool is_off_the_record_;
82 83
83 // The SyncedWindowDelegate associated with this TabModel. 84 // The SyncedWindowDelegate associated with this TabModel.
84 scoped_ptr<browser_sync::SyncedWindowDelegateAndroid> synced_window_delegate_; 85 std::unique_ptr<browser_sync::SyncedWindowDelegateAndroid>
86 synced_window_delegate_;
85 87
86 // Unique identifier of this TabModel for session restore. This id is only 88 // Unique identifier of this TabModel for session restore. This id is only
87 // unique within the current session, and is not guaranteed to be unique 89 // unique within the current session, and is not guaranteed to be unique
88 // across sessions. 90 // across sessions.
89 SessionID session_id_; 91 SessionID session_id_;
90 92
91 // The Registrar used to register TabModel for notifications. 93 // The Registrar used to register TabModel for notifications.
92 content::NotificationRegistrar registrar_; 94 content::NotificationRegistrar registrar_;
93 95
94 DISALLOW_COPY_AND_ASSIGN(TabModel); 96 DISALLOW_COPY_AND_ASSIGN(TabModel);
95 }; 97 };
96 98
97 #endif // CHROME_BROWSER_UI_ANDROID_TAB_MODEL_TAB_MODEL_H_ 99 #endif // CHROME_BROWSER_UI_ANDROID_TAB_MODEL_TAB_MODEL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698