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

Side by Side Diff: chrome/browser/ui/tabs/tab_strip_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_TABS_TAB_STRIP_MODEL_H_ 5 #ifndef CHROME_BROWSER_UI_TABS_TAB_STRIP_MODEL_H_
6 #define CHROME_BROWSER_UI_TABS_TAB_STRIP_MODEL_H_ 6 #define CHROME_BROWSER_UI_TABS_TAB_STRIP_MODEL_H_
7 7
8 #include <stddef.h> 8 #include <stddef.h>
9 #include <stdint.h> 9 #include <stdint.h>
10 10
11 #include <memory>
11 #include <vector> 12 #include <vector>
12 13
13 #include "base/macros.h" 14 #include "base/macros.h"
14 #include "base/memory/scoped_ptr.h"
15 #include "base/observer_list.h" 15 #include "base/observer_list.h"
16 #include "chrome/browser/ui/tabs/tab_strip_model_observer.h" 16 #include "chrome/browser/ui/tabs/tab_strip_model_observer.h"
17 #include "ui/base/models/list_selection_model.h" 17 #include "ui/base/models/list_selection_model.h"
18 #include "ui/base/page_transition_types.h" 18 #include "ui/base/page_transition_types.h"
19 19
20 class Profile; 20 class Profile;
21 class TabStripModelDelegate; 21 class TabStripModelDelegate;
22 class TabStripModelOrderController; 22 class TabStripModelOrderController;
23 23
24 namespace content { 24 namespace content {
(...skipping 509 matching lines...) Expand 10 before | Expand all | Expand 10 after
534 WebContentsDataVector contents_data_; 534 WebContentsDataVector contents_data_;
535 535
536 // A profile associated with this TabStripModel. 536 // A profile associated with this TabStripModel.
537 Profile* profile_; 537 Profile* profile_;
538 538
539 // True if all tabs are currently being closed via CloseAllTabs. 539 // True if all tabs are currently being closed via CloseAllTabs.
540 bool closing_all_; 540 bool closing_all_;
541 541
542 // An object that determines where new Tabs should be inserted and where 542 // An object that determines where new Tabs should be inserted and where
543 // selection should move when a Tab is closed. 543 // selection should move when a Tab is closed.
544 scoped_ptr<TabStripModelOrderController> order_controller_; 544 std::unique_ptr<TabStripModelOrderController> order_controller_;
545 545
546 // Our observers. 546 // Our observers.
547 typedef base::ObserverList<TabStripModelObserver> TabStripModelObservers; 547 typedef base::ObserverList<TabStripModelObserver> TabStripModelObservers;
548 TabStripModelObservers observers_; 548 TabStripModelObservers observers_;
549 549
550 ui::ListSelectionModel selection_model_; 550 ui::ListSelectionModel selection_model_;
551 551
552 // TODO(sky): remove this; used for debugging 291265. 552 // TODO(sky): remove this; used for debugging 291265.
553 bool in_notify_; 553 bool in_notify_;
554 554
555 base::WeakPtrFactory<TabStripModel> weak_factory_; 555 base::WeakPtrFactory<TabStripModel> weak_factory_;
556 556
557 DISALLOW_IMPLICIT_CONSTRUCTORS(TabStripModel); 557 DISALLOW_IMPLICIT_CONSTRUCTORS(TabStripModel);
558 }; 558 };
559 559
560 #endif // CHROME_BROWSER_UI_TABS_TAB_STRIP_MODEL_H_ 560 #endif // CHROME_BROWSER_UI_TABS_TAB_STRIP_MODEL_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/tabs/pinned_tab_service_unittest.cc ('k') | chrome/browser/ui/tabs/tab_strip_model_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698