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

Side by Side Diff: chrome/browser/ui/search_engines/keyword_editor_controller.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_SEARCH_ENGINES_KEYWORD_EDITOR_CONTROLLER_H_ 5 #ifndef CHROME_BROWSER_UI_SEARCH_ENGINES_KEYWORD_EDITOR_CONTROLLER_H_
6 #define CHROME_BROWSER_UI_SEARCH_ENGINES_KEYWORD_EDITOR_CONTROLLER_H_ 6 #define CHROME_BROWSER_UI_SEARCH_ENGINES_KEYWORD_EDITOR_CONTROLLER_H_
7 7
8 #include <memory>
8 #include <string> 9 #include <string>
9 10
10 #include "base/macros.h" 11 #include "base/macros.h"
11 #include "base/memory/scoped_ptr.h"
12 #include "base/strings/string16.h" 12 #include "base/strings/string16.h"
13 13
14 class PrefRegistrySimple; 14 class PrefRegistrySimple;
15 class Profile; 15 class Profile;
16 class TemplateURL; 16 class TemplateURL;
17 class TemplateURLService; 17 class TemplateURLService;
18 class TemplateURLTableModel; 18 class TemplateURLTableModel;
19 19
20 class KeywordEditorController { 20 class KeywordEditorController {
21 public: 21 public:
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
62 TemplateURL* GetTemplateURL(int index); 62 TemplateURL* GetTemplateURL(int index);
63 63
64 TemplateURLTableModel* table_model() { 64 TemplateURLTableModel* table_model() {
65 return table_model_.get(); 65 return table_model_.get();
66 } 66 }
67 67
68 private: 68 private:
69 TemplateURLService* url_model_; 69 TemplateURLService* url_model_;
70 70
71 // Model for the TableView. 71 // Model for the TableView.
72 scoped_ptr<TemplateURLTableModel> table_model_; 72 std::unique_ptr<TemplateURLTableModel> table_model_;
73 73
74 DISALLOW_COPY_AND_ASSIGN(KeywordEditorController); 74 DISALLOW_COPY_AND_ASSIGN(KeywordEditorController);
75 }; 75 };
76 76
77 #endif // CHROME_BROWSER_UI_SEARCH_ENGINES_KEYWORD_EDITOR_CONTROLLER_H_ 77 #endif // CHROME_BROWSER_UI_SEARCH_ENGINES_KEYWORD_EDITOR_CONTROLLER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698