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

Side by Side Diff: chrome/browser/ui/views/website_settings/website_settings_popup_view.cc

Issue 12897004: Remove BubbleDelegateView::Show(); call GetWidget()->Show() instead; etc. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixup more BubbleDelegateView::Show() calls. Created 7 years, 9 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 | Annotate | Revision Log
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 #include "chrome/browser/ui/views/website_settings/website_settings_popup_view.h " 5 #include "chrome/browser/ui/views/website_settings/website_settings_popup_view.h "
6 6
7 #include "base/strings/string_number_conversions.h" 7 #include "base/strings/string_number_conversions.h"
8 #include "base/utf_string_conversions.h" 8 #include "base/utf_string_conversions.h"
9 #include "chrome/browser/api/infobars/infobar_service.h" 9 #include "chrome/browser/api/infobars/infobar_service.h"
10 #include "chrome/browser/certificate_viewer.h" 10 #include "chrome/browser/certificate_viewer.h"
(...skipping 222 matching lines...) Expand 10 before | Expand all | Expand 10 after
233 icon_view->SetImage(rb.GetImageSkiaNamed(IDR_PRODUCT_LOGO_26)); 233 icon_view->SetImage(rb.GetImageSkiaNamed(IDR_PRODUCT_LOGO_26));
234 AddChildView(icon_view); 234 AddChildView(icon_view);
235 235
236 views::Label* label = 236 views::Label* label =
237 new views::Label(l10n_util::GetStringUTF16(IDS_PAGE_INFO_INTERNAL_PAGE)); 237 new views::Label(l10n_util::GetStringUTF16(IDS_PAGE_INFO_INTERNAL_PAGE));
238 label->SetMultiLine(true); 238 label->SetMultiLine(true);
239 label->SetAllowCharacterBreak(true); 239 label->SetAllowCharacterBreak(true);
240 label->SetHorizontalAlignment(gfx::ALIGN_LEFT); 240 label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
241 AddChildView(label); 241 AddChildView(label);
242 242
243 views::BubbleDelegateView::CreateBubble(this); 243 views::BubbleDelegateView::CreateBubble(this)->Show();
244 Show();
245 SizeToContents(); 244 SizeToContents();
246 } 245 }
247 246
248 InternalPageInfoPopupView::~InternalPageInfoPopupView() { 247 InternalPageInfoPopupView::~InternalPageInfoPopupView() {
249 } 248 }
250 249
251 //////////////////////////////////////////////////////////////////////////////// 250 ////////////////////////////////////////////////////////////////////////////////
252 // WebsiteSettingsPopupView 251 // WebsiteSettingsPopupView
253 //////////////////////////////////////////////////////////////////////////////// 252 ////////////////////////////////////////////////////////////////////////////////
254 253
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
327 tabbed_pane_->AddTabAtIndex( 326 tabbed_pane_->AddTabAtIndex(
328 TAB_ID_CONNECTION, 327 TAB_ID_CONNECTION,
329 l10n_util::GetStringUTF16(IDS_WEBSITE_SETTINGS_TAB_LABEL_CONNECTION), 328 l10n_util::GetStringUTF16(IDS_WEBSITE_SETTINGS_TAB_LABEL_CONNECTION),
330 connection_tab_); 329 connection_tab_);
331 DCHECK_EQ(tabbed_pane_->GetTabCount(), NUM_TAB_IDS); 330 DCHECK_EQ(tabbed_pane_->GetTabCount(), NUM_TAB_IDS);
332 tabbed_pane_->set_listener(this); 331 tabbed_pane_->set_listener(this);
333 332
334 set_margins(gfx::Insets(kPopupMarginTop, kPopupMarginLeft, 333 set_margins(gfx::Insets(kPopupMarginTop, kPopupMarginLeft,
335 kPopupMarginBottom, kPopupMarginRight)); 334 kPopupMarginBottom, kPopupMarginRight));
336 335
337 views::BubbleDelegateView::CreateBubble(this); 336 views::BubbleDelegateView::CreateBubble(this)->Show();
338 this->Show();
339 SizeToContents(); 337 SizeToContents();
340 338
341 TabSpecificContentSettings* content_settings = 339 TabSpecificContentSettings* content_settings =
342 TabSpecificContentSettings::FromWebContents(web_contents); 340 TabSpecificContentSettings::FromWebContents(web_contents);
343 InfoBarService* infobar_service = 341 InfoBarService* infobar_service =
344 InfoBarService::FromWebContents(web_contents); 342 InfoBarService::FromWebContents(web_contents);
345 presenter_.reset(new WebsiteSettings(this, profile, 343 presenter_.reset(new WebsiteSettings(this, profile,
346 content_settings, 344 content_settings,
347 infobar_service, 345 infobar_service,
348 url, 346 url,
(...skipping 395 matching lines...) Expand 10 before | Expand all | Expand 10 after
744 742
745 if (link) { 743 if (link) {
746 content_layout->StartRow(1, 0); 744 content_layout->StartRow(1, 0);
747 content_layout->AddView(link); 745 content_layout->AddView(link);
748 } 746 }
749 747
750 layout->AddView(content_pane, 1, 1, views::GridLayout::LEADING, 748 layout->AddView(content_pane, 1, 1, views::GridLayout::LEADING,
751 views::GridLayout::LEADING); 749 views::GridLayout::LEADING);
752 layout->AddPaddingRow(0, kConnectionSectionPaddingBottom); 750 layout->AddPaddingRow(0, kConnectionSectionPaddingBottom);
753 } 751 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/sync/one_click_signin_bubble_view.cc ('k') | ui/message_center/views/message_center_bubble.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698