diff options
| author | markusheintz@chromium.org <markusheintz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-10 12:49:50 +0000 |
|---|---|---|
| committer | markusheintz@chromium.org <markusheintz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-10 12:49:50 +0000 |
| commit | 44cd60e5d3cc1005ac02792cae967af33052a996 (patch) | |
| tree | b1b096403ffb4e1807f66050b05ddb4e3912af1d | |
| parent | 8a08a75432a5d8967f0d7fc6ab24212f69dd6c35 (diff) | |
| download | chromium_src-44cd60e5d3cc1005ac02792cae967af33052a996.zip chromium_src-44cd60e5d3cc1005ac02792cae967af33052a996.tar.gz chromium_src-44cd60e5d3cc1005ac02792cae967af33052a996.tar.bz2 | |
Address post commit comments for CL 10828201
BUG=113688
Review URL: https://chromiumcodereview.appspot.com/10854079
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@151020 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/ui/views/website_settings/website_settings_popup_view.cc | 8 | ||||
| -rw-r--r-- | chrome/browser/ui/views/website_settings/website_settings_popup_view.h | 3 |
2 files changed, 5 insertions, 6 deletions
diff --git a/chrome/browser/ui/views/website_settings/website_settings_popup_view.cc b/chrome/browser/ui/views/website_settings/website_settings_popup_view.cc index 1e74d82..6aa1c47 100644 --- a/chrome/browser/ui/views/website_settings/website_settings_popup_view.cc +++ b/chrome/browser/ui/views/website_settings/website_settings_popup_view.cc @@ -154,7 +154,7 @@ class InternalPageInfoPopupView : public views::BubbleDelegateView { //////////////////////////////////////////////////////////////////////////////// PopupHeaderView::PopupHeaderView(views::ButtonListener* close_button_listener) - : name_(NULL), status_(NULL) { + : name_(NULL), status_(NULL) { views::GridLayout* layout = new views::GridLayout(this); SetLayoutManager(layout); @@ -217,7 +217,7 @@ void PopupHeaderView::SetIdentityName(const string16& name) { } void PopupHeaderView::SetIdentityStatus(const string16& status, - SkColor text_color) { + SkColor text_color) { status_->SetText(status); status_->SetEnabledColor(text_color); } @@ -236,8 +236,8 @@ InternalPageInfoPopupView::InternalPageInfoPopupView(views::View* anchor_view) icon_view->SetImage(rb.GetImageSkiaNamed(IDR_PRODUCT_LOGO_26)); AddChildView(icon_view); - string16 text = l10n_util::GetStringUTF16(IDS_PAGE_INFO_INTERNAL_PAGE); - views::Label* label = new views::Label(text); + views::Label* label = + new views::Label(l10n_util::GetStringUTF16(IDS_PAGE_INFO_INTERNAL_PAGE)); label->SetMultiLine(true); label->SetAllowCharacterBreak(true); label->SetHorizontalAlignment(views::Label::ALIGN_LEFT); diff --git a/chrome/browser/ui/views/website_settings/website_settings_popup_view.h b/chrome/browser/ui/views/website_settings/website_settings_popup_view.h index 4ee8326..ff9b206 100644 --- a/chrome/browser/ui/views/website_settings/website_settings_popup_view.h +++ b/chrome/browser/ui/views/website_settings/website_settings_popup_view.h @@ -116,8 +116,7 @@ class WebsiteSettingsPopupView // tab. TabContents* tab_contents_; - // The presenter that controlls the Website Settings UI. |presenter_| is null - // if the popup is opened for a internal chrome url. + // The presenter that controlls the Website Settings UI. scoped_ptr<WebsiteSettings> presenter_; PopupHeaderView* header_; // Owned by views hierarchy. |