app_list: Initialize more views in the initializer list.

R=xiyuan@chromium.org

Review URL: https://chromiumcodereview.appspot.com/10638018

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@143821 0039d316-1c4b-4281-b951-d872f2087c98

7 files changed, 18 insertions, 29 deletions

diff --git a/ui/app_list/app_list_item_model.cc b/ui/app_list/app_list_item_model.cc
index 6c052cb..82cfd32 100644
--- a/ui/app_list/app_list_item_model.cc
+++ b/ui/app_list/app_list_item_model.cc
@@ -16,14 +16,15 @@ AppListItemModel::~AppListItemModel() {
 
 void AppListItemModel::SetIcon(const SkBitmap& icon) {
   icon_ = icon;
-  FOR_EACH_OBSERVER(AppListItemModelObserver, observers_,
-                    ItemIconChanged());
+  FOR_EACH_OBSERVER(AppListItemModelObserver, observers_, ItemIconChanged());
 }
 
 void AppListItemModel::SetTitle(const std::string& title) {
+  if (title_ == title)
+    return;
+
   title_ = title;
-  FOR_EACH_OBSERVER(AppListItemModelObserver, observers_,
-                    ItemTitleChanged());
+  FOR_EACH_OBSERVER(AppListItemModelObserver, observers_, ItemTitleChanged());
 }
 
 void AppListItemModel::SetHighlighted(bool highlighted) {
@@ -31,7 +32,8 @@ void AppListItemModel::SetHighlighted(bool highlighted) {
     return;
 
   highlighted_ = highlighted;
-  FOR_EACH_OBSERVER(AppListItemModelObserver, observers_,
+  FOR_EACH_OBSERVER(AppListItemModelObserver,
+                    observers_,
                     ItemHighlightedChanged());
 }
 
diff --git a/ui/app_list/apps_grid_view.cc b/ui/app_list/apps_grid_view.cc
index 50b2948..dfe3add 100644
--- a/ui/app_list/apps_grid_view.cc
+++ b/ui/app_list/apps_grid_view.cc
@@ -35,7 +35,7 @@ const int kMinHorizVelocityToSwitchPage = 1100;
 namespace app_list {
 
 AppsGridView::AppsGridView(views::ButtonListener* listener,
-                                   PaginationModel* pagination_model)
+                           PaginationModel* pagination_model)
     : model_(NULL),
       listener_(listener),
       pagination_model_(pagination_model),
diff --git a/ui/app_list/page_switcher.cc b/ui/app_list/page_switcher.cc
index fce98bf..c0b4d6f 100644
--- a/ui/app_list/page_switcher.cc
+++ b/ui/app_list/page_switcher.cc
@@ -123,8 +123,7 @@ namespace app_list {
 
 PageSwitcher::PageSwitcher(PaginationModel* model)
     : model_(model),
-      buttons_(NULL) {
-  buttons_ = new views::View;
+      buttons_(new views::View) {
   buttons_->SetLayoutManager(new views::BoxLayout(
       views::BoxLayout::kHorizontal, 0, 0, kButtonSpacing));
   AddChildView(buttons_);
diff --git a/ui/app_list/pagination_model.cc b/ui/app_list/pagination_model.cc
index d58a5fc..8f5104e 100644
--- a/ui/app_list/pagination_model.cc
+++ b/ui/app_list/pagination_model.cc
@@ -31,9 +31,7 @@ void PaginationModel::SetTotalPages(int total_pages) {
     SelectPage(0, false /* animate */);
   if (selected_page_ >= total_pages_)
     SelectPage(total_pages_ - 1, false /* animate */);
-  FOR_EACH_OBSERVER(PaginationModelObserver,
-                    observers_,
-                    TotalPagesChanged());
+  FOR_EACH_OBSERVER(PaginationModelObserver, observers_, TotalPagesChanged());
 }
 
 void PaginationModel::SelectPage(int page, bool animate) {
diff --git a/ui/app_list/search_box_model.cc b/ui/app_list/search_box_model.cc
index efff968..c885086 100644
--- a/ui/app_list/search_box_model.cc
+++ b/ui/app_list/search_box_model.cc
@@ -5,7 +5,6 @@
 #include "ui/app_list/search_box_model.h"
 
 #include "ui/app_list/search_box_model_observer.h"
-#include "ui/views/controls/textfield/textfield.h"
 
 namespace app_list {
 
@@ -17,9 +16,7 @@ SearchBoxModel::~SearchBoxModel() {
 
 void SearchBoxModel::SetIcon(const gfx::ImageSkia& icon) {
   icon_ = icon;
-  FOR_EACH_OBSERVER(SearchBoxModelObserver,
-                    observers_,
-                    IconChanged());
+  FOR_EACH_OBSERVER(SearchBoxModelObserver, observers_, IconChanged());
 }
 
 void SearchBoxModel::SetHintText(const string16& hint_text) {
@@ -27,9 +24,7 @@ void SearchBoxModel::SetHintText(const string16& hint_text) {
     return;
 
   hint_text_ = hint_text;
-  FOR_EACH_OBSERVER(SearchBoxModelObserver,
-                    observers_,
-                    HintTextChanged());
+  FOR_EACH_OBSERVER(SearchBoxModelObserver, observers_, HintTextChanged());
 }
 
 void SearchBoxModel::SetSelectionModel(const gfx::SelectionModel& sel) {
@@ -47,9 +42,7 @@ void SearchBoxModel::SetText(const string16& text) {
     return;
 
   text_ = text;
-  FOR_EACH_OBSERVER(SearchBoxModelObserver,
-                    observers_,
-                    TextChanged());
+  FOR_EACH_OBSERVER(SearchBoxModelObserver, observers_, TextChanged());
 }
 
 void SearchBoxModel::AddObserver(SearchBoxModelObserver* observer) {
diff --git a/ui/app_list/search_box_view.cc b/ui/app_list/search_box_view.cc
index 1c5a6df..ab84d01 100644
--- a/ui/app_list/search_box_view.cc
+++ b/ui/app_list/search_box_view.cc
@@ -29,17 +29,15 @@ const SkColor kHintTextColor = SkColorSetRGB(0xA0, 0xA0, 0xA0);
 SearchBoxView::SearchBoxView(SearchBoxViewDelegate* delegate)
     : delegate_(delegate),
       model_(NULL),
-      icon_view_(NULL),
-      search_box_(NULL),
+      icon_view_(new views::ImageView),
+      search_box_(new views::Textfield),
       contents_view_(NULL) {
-  icon_view_ = new views::ImageView;
   AddChildView(icon_view_);
 
-  search_box_ = new views::Textfield;
   search_box_->RemoveBorder();
-  ResourceBundle& rb = ResourceBundle::GetSharedInstance();
+  ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   search_box_->SetFont(gfx::Font(
-      rb.GetFont(ResourceBundle::BaseFont).GetFontName(),
+      rb.GetFont(ui::ResourceBundle::BaseFont).GetFontName(),
       kFontSize));
   search_box_->set_placeholder_text_color(kHintTextColor);
   search_box_->SetController(this);
diff --git a/ui/app_list/search_result_view.cc b/ui/app_list/search_result_view.cc
index 9ffe6ff..fce31cc 100644
--- a/ui/app_list/search_result_view.cc
+++ b/ui/app_list/search_result_view.cc
@@ -93,8 +93,7 @@ SearchResultView::SearchResultView(SearchResultListView* list_view,
     : views::CustomButton(listener),
       result_(NULL),
       list_view_(list_view),
-      icon_(NULL) {
-  icon_ = new IconView;
+      icon_(new IconView) {
   AddChildView(icon_);
 }