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

Side by Side Diff: chrome/browser/ui/content_settings/content_setting_image_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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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_CONTENT_SETTINGS_CONTENT_SETTING_IMAGE_MODEL_H_ 5 #ifndef CHROME_BROWSER_UI_CONTENT_SETTINGS_CONTENT_SETTING_IMAGE_MODEL_H_
6 #define CHROME_BROWSER_UI_CONTENT_SETTINGS_CONTENT_SETTING_IMAGE_MODEL_H_ 6 #define CHROME_BROWSER_UI_CONTENT_SETTINGS_CONTENT_SETTING_IMAGE_MODEL_H_
7 7
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "base/memory/scoped_vector.h" 9 #include "base/memory/scoped_vector.h"
10 #include "base/strings/string16.h" 10 #include "base/strings/string16.h"
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
102 102
103 // ContentSettingImageModel implementation. 103 // ContentSettingImageModel implementation.
104 ContentSettingBubbleModel* CreateBubbleModel( 104 ContentSettingBubbleModel* CreateBubbleModel(
105 ContentSettingBubbleModel::Delegate* delegate, 105 ContentSettingBubbleModel::Delegate* delegate,
106 content::WebContents* web_contents, 106 content::WebContents* web_contents,
107 Profile* profile) override; 107 Profile* profile) override;
108 bool ShouldRunAnimation(content::WebContents* web_contents) override; 108 bool ShouldRunAnimation(content::WebContents* web_contents) override;
109 void SetAnimationHasRun(content::WebContents* web_contents) override; 109 void SetAnimationHasRun(content::WebContents* web_contents) override;
110 110
111 // Factory method. Used only for testing. 111 // Factory method. Used only for testing.
112 static scoped_ptr<ContentSettingImageModel> CreateForContentTypeForTesting( 112 static std::unique_ptr<ContentSettingImageModel>
113 ContentSettingsType content_type); 113 CreateForContentTypeForTesting(ContentSettingsType content_type);
114 114
115 protected: 115 protected:
116 ContentSettingsType content_type() { return content_type_; } 116 ContentSettingsType content_type() { return content_type_; }
117 117
118 private: 118 private:
119 ContentSettingsType content_type_; 119 ContentSettingsType content_type_;
120 120
121 DISALLOW_COPY_AND_ASSIGN(ContentSettingSimpleImageModel); 121 DISALLOW_COPY_AND_ASSIGN(ContentSettingSimpleImageModel);
122 }; 122 };
123 123
124 #endif // CHROME_BROWSER_UI_CONTENT_SETTINGS_CONTENT_SETTING_IMAGE_MODEL_H_ 124 #endif // CHROME_BROWSER_UI_CONTENT_SETTINGS_CONTENT_SETTING_IMAGE_MODEL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698