Commit d561d285 authored by pkasting@chromium.org's avatar pkasting@chromium.org

Ensure all members of OriginChipInfo/OriginChipView get initialized.

BUG=382921
TEST=none
TBR=gbillock

Review URL: https://codereview.chromium.org/345183005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@278845 0039d316-1c4b-4281-b951-d872f2087c98
parent 1a8376c7
...@@ -81,13 +81,17 @@ int StringForChromeHost(const GURL& url) { ...@@ -81,13 +81,17 @@ int StringForChromeHost(const GURL& url) {
} // namespace } // namespace
OriginChipInfo::OriginChipInfo( OriginChipInfo::OriginChipInfo(extensions::IconImage::Observer* owner,
extensions::IconImage::Observer* owner, Profile* profile)
Profile* profile)
: owner_(owner), : owner_(owner),
profile_(profile) {} profile_(profile),
security_level_(ToolbarModel::NONE),
is_url_malware_(false),
icon_(IDR_PRODUCT_LOGO_16) {
}
OriginChipInfo::~OriginChipInfo() {} OriginChipInfo::~OriginChipInfo() {
}
bool OriginChipInfo::Update(const content::WebContents* web_contents, bool OriginChipInfo::Update(const content::WebContents* web_contents,
const ToolbarModel* toolbar_model) { const ToolbarModel* toolbar_model) {
......
...@@ -144,7 +144,9 @@ OriginChipView::OriginChipView(LocationBarView* location_bar_view, ...@@ -144,7 +144,9 @@ OriginChipView::OriginChipView(LocationBarView* location_bar_view,
location_bar_view_(location_bar_view), location_bar_view_(location_bar_view),
profile_(profile), profile_(profile),
showing_16x16_icon_(false), showing_16x16_icon_(false),
fade_in_animation_(this) { fade_in_animation_(this),
security_level_(ToolbarModel::NONE),
url_malware_(false) {
EnableCanvasFlippingForRTLUI(true); EnableCanvasFlippingForRTLUI(true);
scoped_refptr<SafeBrowsingService> sb_service = scoped_refptr<SafeBrowsingService> sb_service =
...@@ -174,6 +176,9 @@ OriginChipView::OriginChipView(LocationBarView* location_bar_view, ...@@ -174,6 +176,9 @@ OriginChipView::OriginChipView(LocationBarView* location_bar_view,
fade_in_animation_.SetTweenType(gfx::Tween::LINEAR_OUT_SLOW_IN); fade_in_animation_.SetTweenType(gfx::Tween::LINEAR_OUT_SLOW_IN);
fade_in_animation_.SetSlideDuration(175); fade_in_animation_.SetSlideDuration(175);
// Ensure various other members get initialized.
SetBorderImages(kNormalImages);
} }
OriginChipView::~OriginChipView() { OriginChipView::~OriginChipView() {
......
...@@ -2168,10 +2168,3 @@ name=bug_377728 ...@@ -2168,10 +2168,3 @@ name=bug_377728
*!HunspellEngine::FillSuggestionList *!HunspellEngine::FillSuggestionList
*!SpellcheckLanguage::SpellCheckWord *!SpellcheckLanguage::SpellCheckWord
*!SpellCheck::SpellCheckWord *!SpellCheck::SpellCheckWord
UNINITIALIZED READ
name=bug_382921
...
*!LocationBarView::OnChanged
*!OmniboxEditModel::OnChanged
*!OmniboxViewViews::SetWindowTextAndCaretPos
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment