diff options
author | maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-07 02:23:06 +0000 |
---|---|---|
committer | maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-07 02:23:06 +0000 |
commit | 09fe9499ec1cb0d327a03e433022cb8603a16933 (patch) | |
tree | 94322e3ec5b44213991a6472146a341844e5a39c /chrome | |
parent | 47cc0b4e64ab6cd03ef94674adb7788bc85f2cdc (diff) | |
download | chromium_src-09fe9499ec1cb0d327a03e433022cb8603a16933.zip chromium_src-09fe9499ec1cb0d327a03e433022cb8603a16933.tar.gz chromium_src-09fe9499ec1cb0d327a03e433022cb8603a16933.tar.bz2 |
Fix style issues in View class.
BUG=None
TEST=None
Patch contributed by thiago.farina@gmail.com
Review URL: http://codereview.chromium.org/338011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31360 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r-- | chrome/browser/extensions/extension_host.cc | 2 | ||||
-rw-r--r-- | chrome/browser/first_run_win.cc | 2 | ||||
-rwxr-xr-x | chrome/browser/views/about_chrome_view.cc | 10 | ||||
-rw-r--r-- | chrome/browser/views/autocomplete/autocomplete_popup_gtk.cc | 2 | ||||
-rw-r--r-- | chrome/browser/views/autocomplete/autocomplete_popup_win.cc | 2 | ||||
-rw-r--r-- | chrome/browser/views/bookmark_editor_view.cc | 6 | ||||
-rw-r--r-- | chrome/browser/views/clear_browsing_data.cc | 4 | ||||
-rw-r--r-- | chrome/browser/views/extensions/extension_shelf.cc | 2 | ||||
-rw-r--r-- | chrome/browser/views/frame/browser_view.cc | 4 | ||||
-rw-r--r-- | chrome/browser/views/fullscreen_exit_bubble.cc | 2 | ||||
-rw-r--r-- | chrome/browser/views/importing_progress_view.cc | 20 | ||||
-rw-r--r-- | chrome/browser/views/infobars/infobars.cc | 2 | ||||
-rw-r--r-- | chrome/browser/views/location_bar_view.cc | 16 | ||||
-rw-r--r-- | chrome/browser/views/notifications/balloon_view.cc | 2 | ||||
-rw-r--r-- | chrome/browser/views/options/exceptions_page_view.cc | 6 | ||||
-rw-r--r-- | chrome/browser/views/options/passwords_page_view.cc | 8 | ||||
-rw-r--r-- | chrome/browser/views/tabs/dragged_tab_view.cc | 2 |
17 files changed, 46 insertions, 46 deletions
diff --git a/chrome/browser/extensions/extension_host.cc b/chrome/browser/extensions/extension_host.cc index 541c4a9..ba7d54b 100644 --- a/chrome/browser/extensions/extension_host.cc +++ b/chrome/browser/extensions/extension_host.cc @@ -153,7 +153,7 @@ void ExtensionHost::CreateView(Browser* browser) { view_.reset(new ExtensionView(this, browser)); // We own |view_|, so don't auto delete when it's removed from the view // hierarchy. - view_->SetParentOwned(false); + view_->set_parent_owned(false); #elif defined(OS_LINUX) view_.reset(new ExtensionViewGtk(this, browser)); view_->Init(); diff --git a/chrome/browser/first_run_win.cc b/chrome/browser/first_run_win.cc index fc2d8eb..cada11c 100644 --- a/chrome/browser/first_run_win.cc +++ b/chrome/browser/first_run_win.cc @@ -396,7 +396,7 @@ bool OpenFirstRunDialog(Profile* profile, homepage_defined, import_items, dont_import_items)); - first_run_view->SetParentOwned(false); + first_run_view->set_parent_owned(false); views::Window* first_run_ui = views::Window::CreateChromeWindow( NULL, gfx::Rect(), first_run_view.get()); DCHECK(first_run_ui); diff --git a/chrome/browser/views/about_chrome_view.cc b/chrome/browser/views/about_chrome_view.cc index 5215d23..25da360 100755 --- a/chrome/browser/views/about_chrome_view.cc +++ b/chrome/browser/views/about_chrome_view.cc @@ -137,23 +137,23 @@ void AboutChromeView::Init() { // Views we will add to the *parent* of this dialog, since it will display // next to the buttons which we don't draw ourselves. throbber_.reset(new views::Throbber(50, true)); - throbber_->SetParentOwned(false); + throbber_->set_parent_owned(false); throbber_->SetVisible(false); SkBitmap* success_image = rb.GetBitmapNamed(IDR_UPDATE_UPTODATE); success_indicator_.SetImage(*success_image); - success_indicator_.SetParentOwned(false); + success_indicator_.set_parent_owned(false); SkBitmap* update_available_image = rb.GetBitmapNamed(IDR_UPDATE_AVAILABLE); update_available_indicator_.SetImage(*update_available_image); - update_available_indicator_.SetParentOwned(false); + update_available_indicator_.set_parent_owned(false); SkBitmap* timeout_image = rb.GetBitmapNamed(IDR_UPDATE_FAIL); timeout_indicator_.SetImage(*timeout_image); - timeout_indicator_.SetParentOwned(false); + timeout_indicator_.set_parent_owned(false); update_label_.SetVisible(false); - update_label_.SetParentOwned(false); + update_label_.set_parent_owned(false); // Regular view controls we draw by ourself. First, we add the background // image for the dialog. We have two different background bitmaps, one for diff --git a/chrome/browser/views/autocomplete/autocomplete_popup_gtk.cc b/chrome/browser/views/autocomplete/autocomplete_popup_gtk.cc index bffd707..5ea5e39 100644 --- a/chrome/browser/views/autocomplete/autocomplete_popup_gtk.cc +++ b/chrome/browser/views/autocomplete/autocomplete_popup_gtk.cc @@ -48,7 +48,7 @@ void AutocompletePopupGtk::Init(AutocompleteEditView* edit_view, WidgetGtk::Init(gtk_widget_get_parent(edit_view->GetNativeView()), contents_->GetPopupBounds()); // The contents is owned by the LocationBarView. - contents_->SetParentOwned(false); + contents_->set_parent_owned(false); SetContentsView(contents_); edit_view_ = edit_view; diff --git a/chrome/browser/views/autocomplete/autocomplete_popup_win.cc b/chrome/browser/views/autocomplete/autocomplete_popup_win.cc index 6caf2b6..f3737ae 100644 --- a/chrome/browser/views/autocomplete/autocomplete_popup_win.cc +++ b/chrome/browser/views/autocomplete/autocomplete_popup_win.cc @@ -45,7 +45,7 @@ void AutocompletePopupWin::Init(AutocompleteEditView* edit_view, WidgetWin::Init(GetAncestor(edit_view->GetNativeView(), GA_ROOT), contents_->GetPopupBounds()); // The contents is owned by the LocationBarView. - contents_->SetParentOwned(false); + contents_->set_parent_owned(false); SetContentsView(contents_); // When an IME is attached to the rich-edit control, retrieve its window diff --git a/chrome/browser/views/bookmark_editor_view.cc b/chrome/browser/views/bookmark_editor_view.cc index f40e25f..c3f8049b 100644 --- a/chrome/browser/views/bookmark_editor_view.cc +++ b/chrome/browser/views/bookmark_editor_view.cc @@ -260,8 +260,8 @@ void BookmarkEditorView::Init() { DCHECK(bb_model_); bb_model_->AddObserver(this); - url_tf_.SetParentOwned(false); - title_tf_.SetParentOwned(false); + url_tf_.set_parent_owned(false); + title_tf_.set_parent_owned(false); std::wstring title; if (details_.type == EditDetails::EXISTING_NODE) @@ -288,7 +288,7 @@ void BookmarkEditorView::Init() { tree_view_ = new views::TreeView(); new_group_button_.reset(new views::NativeButton( this, l10n_util::GetString(IDS_BOOMARK_EDITOR_NEW_FOLDER_BUTTON))); - new_group_button_->SetParentOwned(false); + new_group_button_->set_parent_owned(false); tree_view_->SetContextMenuController(this); tree_view_->SetRootShown(false); diff --git a/chrome/browser/views/clear_browsing_data.cc b/chrome/browser/views/clear_browsing_data.cc index 322543e..8b94636 100644 --- a/chrome/browser/views/clear_browsing_data.cc +++ b/chrome/browser/views/clear_browsing_data.cc @@ -69,12 +69,12 @@ void ClearBrowsingDataView::Init() { // Views we will add to the *parent* of this dialog, since it will display // next to the buttons which we don't draw ourselves. throbber_.reset(new views::Throbber(50, true)); - throbber_->SetParentOwned(false); + throbber_->set_parent_owned(false); throbber_->SetVisible(false); status_label_.SetText(l10n_util::GetString(IDS_CLEAR_DATA_DELETING)); status_label_.SetVisible(false); - status_label_.SetParentOwned(false); + status_label_.set_parent_owned(false); // Regular view controls we draw by ourself. First, we add the dialog label. delete_all_label_ = new views::Label( diff --git a/chrome/browser/views/extensions/extension_shelf.cc b/chrome/browser/views/extensions/extension_shelf.cc index a586da32..b462128 100644 --- a/chrome/browser/views/extensions/extension_shelf.cc +++ b/chrome/browser/views/extensions/extension_shelf.cc @@ -246,7 +246,7 @@ ExtensionShelf::Toolstrip::Toolstrip(ExtensionShelf* shelf, ALLOW_THIS_IN_INITIALIZER_LIST(timer_factory_(this)) { DCHECK(host->view()); // We're owned by shelf_, not the bubble that we get inserted in and out of. - SetParentOwned(false); + set_parent_owned(false); mole_animation_.reset(new SlideAnimation(this)); diff --git a/chrome/browser/views/frame/browser_view.cc b/chrome/browser/views/frame/browser_view.cc index 771f65a..ac22274 100644 --- a/chrome/browser/views/frame/browser_view.cc +++ b/chrome/browser/views/frame/browser_view.cc @@ -1051,7 +1051,7 @@ bool BrowserView::IsDownloadShelfVisible() const { DownloadShelf* BrowserView::GetDownloadShelf() { if (!download_shelf_.get()) { download_shelf_.reset(new DownloadShelfView(browser_.get(), this)); - download_shelf_->SetParentOwned(false); + download_shelf_->set_parent_owned(false); } return download_shelf_.get(); } @@ -1953,7 +1953,7 @@ bool BrowserView::MaybeShowBookmarkBar(TabContents* contents) { if (!bookmark_bar_view_.get()) { bookmark_bar_view_.reset(new BookmarkBarView(contents->profile(), browser_.get())); - bookmark_bar_view_->SetParentOwned(false); + bookmark_bar_view_->set_parent_owned(false); bookmark_bar_view_->set_background( new BookmarkExtensionBackground(this, bookmark_bar_view_.get(), browser_.get())); diff --git a/chrome/browser/views/fullscreen_exit_bubble.cc b/chrome/browser/views/fullscreen_exit_bubble.cc index 5973e23..3d4f06d 100644 --- a/chrome/browser/views/fullscreen_exit_bubble.cc +++ b/chrome/browser/views/fullscreen_exit_bubble.cc @@ -48,7 +48,7 @@ const int FullscreenExitBubble::FullscreenExitView::kPaddingPixels = 8; FullscreenExitBubble::FullscreenExitView::FullscreenExitView( FullscreenExitBubble* bubble, const std::wstring& accelerator) { - link_.SetParentOwned(false); + link_.set_parent_owned(false); link_.SetText(l10n_util::GetStringF(IDS_EXIT_FULLSCREEN_MODE, accelerator)); link_.SetController(bubble); link_.SetFont(ResourceBundle::GetSharedInstance().GetFont( diff --git a/chrome/browser/views/importing_progress_view.cc b/chrome/browser/views/importing_progress_view.cc index ed58f9c..32b92e5 100644 --- a/chrome/browser/views/importing_progress_view.cc +++ b/chrome/browser/views/importing_progress_view.cc @@ -58,16 +58,16 @@ ImportingProgressView::ImportingProgressView(const std::wstring& source_name, label_cookies_->SetHorizontalAlignment(views::Label::ALIGN_LEFT); // These are scoped pointers, so we don't need the parent to delete them. - state_bookmarks_->SetParentOwned(false); - state_searches_->SetParentOwned(false); - state_passwords_->SetParentOwned(false); - state_history_->SetParentOwned(false); - state_cookies_->SetParentOwned(false); - label_bookmarks_->SetParentOwned(false); - label_searches_->SetParentOwned(false); - label_passwords_->SetParentOwned(false); - label_history_->SetParentOwned(false); - label_cookies_->SetParentOwned(false); + state_bookmarks_->set_parent_owned(false); + state_searches_->set_parent_owned(false); + state_passwords_->set_parent_owned(false); + state_history_->set_parent_owned(false); + state_cookies_->set_parent_owned(false); + label_bookmarks_->set_parent_owned(false); + label_searches_->set_parent_owned(false); + label_passwords_->set_parent_owned(false); + label_history_->set_parent_owned(false); + label_cookies_->set_parent_owned(false); } ImportingProgressView::~ImportingProgressView() { diff --git a/chrome/browser/views/infobars/infobars.cc b/chrome/browser/views/infobars/infobars.cc index be4e0ed..07e2de9 100644 --- a/chrome/browser/views/infobars/infobars.cc +++ b/chrome/browser/views/infobars/infobars.cc @@ -114,7 +114,7 @@ InfoBar::InfoBar(InfoBarDelegate* delegate) close_button_(new views::ImageButton(this))), ALLOW_THIS_IN_INITIALIZER_LIST(delete_factory_(this)) { // We delete ourselves when we're removed from the view hierarchy. - SetParentOwned(false); + set_parent_owned(false); set_background(new InfoBarBackground(delegate->GetInfoBarType())); diff --git a/chrome/browser/views/location_bar_view.cc b/chrome/browser/views/location_bar_view.cc index f159d7e..fe71b89 100644 --- a/chrome/browser/views/location_bar_view.cc +++ b/chrome/browser/views/location_bar_view.cc @@ -213,7 +213,7 @@ void LocationBarView::Init() { AddChildView(&selected_keyword_view_); selected_keyword_view_.SetFont(font_); selected_keyword_view_.SetVisible(false); - selected_keyword_view_.SetParentOwned(false); + selected_keyword_view_.set_parent_owned(false); SkColor dimmed_text = GetColor(false, DEEMPHASIZED_TEXT); @@ -221,21 +221,21 @@ void LocationBarView::Init() { type_to_search_view_.SetVisible(false); type_to_search_view_.SetFont(font_); type_to_search_view_.SetColor(dimmed_text); - type_to_search_view_.SetParentOwned(false); + type_to_search_view_.set_parent_owned(false); AddChildView(&keyword_hint_view_); keyword_hint_view_.SetVisible(false); keyword_hint_view_.SetFont(font_); keyword_hint_view_.SetColor(dimmed_text); - keyword_hint_view_.SetParentOwned(false); + keyword_hint_view_.set_parent_owned(false); AddChildView(&security_image_view_); security_image_view_.SetVisible(false); - security_image_view_.SetParentOwned(false); + security_image_view_.set_parent_owned(false); AddChildView(&info_label_); info_label_.SetVisible(false); - info_label_.SetParentOwned(false); + info_label_.set_parent_owned(false); // Notify us when any ancestor is resized. In this case we want to tell the // AutocompleteEditView to close its popup. @@ -721,7 +721,7 @@ void LocationBarView::RefreshPageActionViews() { new PageActionImageView(this, profile_, page_actions[i], bubble_positioner_)); page_action_views_[i]->SetVisible(false); - page_action_views_[i]->SetParentOwned(false); + page_action_views_[i]->set_parent_owned(false); AddChildView(page_action_views_[i]); } } @@ -833,8 +833,8 @@ LocationBarView::SelectedKeywordView::SelectedKeywordView(Profile* profile) AddChildView(&partial_label_); // Full_label and partial_label are deleted by us, make sure View doesn't // delete them too. - full_label_.SetParentOwned(false); - partial_label_.SetParentOwned(false); + full_label_.set_parent_owned(false); + partial_label_.set_parent_owned(false); full_label_.SetVisible(false); partial_label_.SetVisible(false); full_label_.set_border( diff --git a/chrome/browser/views/notifications/balloon_view.cc b/chrome/browser/views/notifications/balloon_view.cc index 43a8554..48cf346 100644 --- a/chrome/browser/views/notifications/balloon_view.cc +++ b/chrome/browser/views/notifications/balloon_view.cc @@ -92,7 +92,7 @@ BalloonViewImpl::BalloonViewImpl() method_factory_(this) { // This object is not to be deleted by the views hierarchy, // as it is owned by the balloon. - SetParentOwned(false); + set_parent_owned(false); // Load the sprites for the frames. ResourceBundle& rb = ResourceBundle::GetSharedInstance(); diff --git a/chrome/browser/views/options/exceptions_page_view.cc b/chrome/browser/views/options/exceptions_page_view.cc index 5e8ac43..7d60f5e 100644 --- a/chrome/browser/views/options/exceptions_page_view.cc +++ b/chrome/browser/views/options/exceptions_page_view.cc @@ -154,13 +154,13 @@ void ExceptionsPageView::InitControlLayout() { // ExceptionsPageView, private void ExceptionsPageView::SetupButtons() { // Disable all buttons in the first place. - remove_button_.SetParentOwned(false); + remove_button_.set_parent_owned(false); remove_button_.SetEnabled(false); - remove_all_button_.SetParentOwned(false); + remove_all_button_.set_parent_owned(false); remove_all_button_.SetEnabled(false); - show_button_.SetParentOwned(false); + show_button_.set_parent_owned(false); show_button_.SetEnabled(false); show_button_.SetVisible(false); } diff --git a/chrome/browser/views/options/passwords_page_view.cc b/chrome/browser/views/options/passwords_page_view.cc index 739c336a..a8179c2 100644 --- a/chrome/browser/views/options/passwords_page_view.cc +++ b/chrome/browser/views/options/passwords_page_view.cc @@ -301,16 +301,16 @@ void PasswordsPageView::InitControlLayout() { // PasswordsPageView, private void PasswordsPageView::SetupButtonsAndLabels() { // Disable all buttons in the first place. - show_button_.SetParentOwned(false); + show_button_.set_parent_owned(false); show_button_.SetEnabled(false); - remove_button_.SetParentOwned(false); + remove_button_.set_parent_owned(false); remove_button_.SetEnabled(false); - remove_all_button_.SetParentOwned(false); + remove_all_button_.set_parent_owned(false); remove_all_button_.SetEnabled(false); - password_label_.SetParentOwned(false); + password_label_.set_parent_owned(false); } void PasswordsPageView::SetupTable() { diff --git a/chrome/browser/views/tabs/dragged_tab_view.cc b/chrome/browser/views/tabs/dragged_tab_view.cc index 293b47b..d3a9263 100644 --- a/chrome/browser/views/tabs/dragged_tab_view.cc +++ b/chrome/browser/views/tabs/dragged_tab_view.cc @@ -40,7 +40,7 @@ DraggedTabView::DraggedTabView(TabContents* datasource, contents_size_(contents_size), close_animation_(this), tab_width_(0) { - SetParentOwned(false); + set_parent_owned(false); renderer_->UpdateData(datasource, false); |