app_list: Minor trivial cleanup while I'm here.

Just removing unnecessary app_list:: at some call sites.

R=xiyuan@chromium.org

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

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

11 files changed, 36 insertions, 40 deletions

diff --git a/ui/app_list/signin_delegate.cc b/ui/app_list/signin_delegate.cc
index 51eb830..93b0889 100644
--- a/ui/app_list/signin_delegate.cc
+++ b/ui/app_list/signin_delegate.cc
@@ -20,8 +20,7 @@ void SigninDelegate::RemoveObserver(SigninDelegateObserver* observer) {
 }
 
 void SigninDelegate::NotifySigninSuccess() {
-  FOR_EACH_OBSERVER(app_list::SigninDelegateObserver, observers_,
-                    OnSigninSuccess());
+  FOR_EACH_OBSERVER(SigninDelegateObserver, observers_, OnSigninSuccess());
 }
 
 }  // namespace app_list
diff --git a/ui/app_list/views/app_list_main_view.cc b/ui/app_list/views/app_list_main_view.cc
index fa0de27..d2df1de 100644
--- a/ui/app_list/views/app_list_main_view.cc
+++ b/ui/app_list/views/app_list_main_view.cc
@@ -134,7 +134,7 @@ void AppListMainView::Prerender() {
 }
 
 void AppListMainView::SetDragAndDropHostOfCurrentAppList(
-    app_list::ApplicationDragAndDropHost* drag_and_drop_host) {
+    ApplicationDragAndDropHost* drag_and_drop_host) {
   contents_view_->SetDragAndDropHostOfCurrentAppList(drag_and_drop_host);
 }
 
diff --git a/ui/app_list/views/app_list_menu_views.h b/ui/app_list/views/app_list_menu_views.h
index 15f3dbb..32efc3a 100644
--- a/ui/app_list/views/app_list_menu_views.h
+++ b/ui/app_list/views/app_list_menu_views.h
@@ -22,7 +22,7 @@ namespace app_list {
 
 // Views implementation of the app list menu.
 // TODO(benwells): We should consider moving this into Chrome.
-class AppListMenuViews : public app_list::AppListMenu {
+class AppListMenuViews : public AppListMenu {
  public:
   explicit AppListMenuViews(AppListViewDelegate* delegate);
   virtual ~AppListMenuViews();
diff --git a/ui/app_list/views/app_list_view.cc b/ui/app_list/views/app_list_view.cc
index 118ab2b..e053181b 100644
--- a/ui/app_list/views/app_list_view.cc
+++ b/ui/app_list/views/app_list_view.cc
@@ -142,7 +142,7 @@ void AppListView::SetAnchorPoint(const gfx::Point& anchor_point) {
 }
 
 void AppListView::SetDragAndDropHostOfCurrentAppList(
-    app_list::ApplicationDragAndDropHost* drag_and_drop_host) {
+    ApplicationDragAndDropHost* drag_and_drop_host) {
   app_list_main_view_->SetDragAndDropHostOfCurrentAppList(drag_and_drop_host);
 }
 
diff --git a/ui/app_list/views/app_list_view.h b/ui/app_list/views/app_list_view.h
index fff4815..502b934 100644
--- a/ui/app_list/views/app_list_view.h
+++ b/ui/app_list/views/app_list_view.h
@@ -49,7 +49,7 @@ class APP_LIST_EXPORT AppListView : public views::BubbleDelegateView,
   // InitAsBubble was called since the app list object needs to exist so that
   // it can set the host.
   void SetDragAndDropHostOfCurrentAppList(
-      app_list::ApplicationDragAndDropHost* drag_and_drop_host);
+      ApplicationDragAndDropHost* drag_and_drop_host);
 
   // Shows the UI when there are no pending icon loads. Otherwise, starts a
   // timer to show the UI when a maximum allowed wait time has expired.
diff --git a/ui/app_list/views/apps_grid_view.cc b/ui/app_list/views/apps_grid_view.cc
index d4ad0e8..c9f28e1 100644
--- a/ui/app_list/views/apps_grid_view.cc
+++ b/ui/app_list/views/apps_grid_view.cc
@@ -34,6 +34,8 @@
 #include "ui/base/dragdrop/os_exchange_data_provider_win.h"
 #endif
 
+namespace app_list {
+
 namespace {
 
 // Distance a drag needs to be from the app grid to be considered 'outside', at
@@ -66,7 +68,7 @@ const int kPrerenderPages = 1;
 const float kDragAndDropProxyScale = 1.5f;
 
 // For testing we remember the last created grid view.
-app_list::AppsGridView* last_created_grid_view_for_test = NULL;
+AppsGridView* last_created_grid_view_for_test = NULL;
 
 // RowMoveAnimationDelegate is used when moving an item into a different row.
 // Before running the animation, the item's layer is re-created and kept in
@@ -120,8 +122,6 @@ class RowMoveAnimationDelegate
 
 }  // namespace
 
-namespace app_list {
-
 #if defined(OS_WIN) && !defined(USE_AURA)
 // Interprets drag events sent from Windows via the drag/drop API and forwards
 // them to AppsGridView.
@@ -134,16 +134,15 @@ namespace app_list {
 // Windows drag that never enters the synchronous drag phase.
 class SynchronousDrag : public ui::DragSourceWin {
  public:
-  SynchronousDrag(app_list::AppsGridView* grid_view,
-              app_list::AppListItemView* drag_view,
-              const gfx::Point& drag_view_offset)
+  SynchronousDrag(AppsGridView* grid_view,
+                  AppListItemView* drag_view,
+                  const gfx::Point& drag_view_offset)
       : grid_view_(grid_view),
         drag_view_(drag_view),
         drag_view_offset_(drag_view_offset),
         has_shortcut_path_(false),
         running_(false),
-        canceled_(false) {
-  }
+        canceled_(false) {}
 
   void set_shortcut_path(const base::FilePath& shortcut_path) {
     has_shortcut_path_ = true;
@@ -187,8 +186,7 @@ class SynchronousDrag : public ui::DragSourceWin {
   }
 
   virtual void OnDragSourceMove() OVERRIDE {
-    grid_view_->UpdateDrag(app_list::AppsGridView::MOUSE,
-                           GetCursorInGridViewCoords());
+    grid_view_->UpdateDrag(AppsGridView::MOUSE, GetCursorInGridViewCoords());
   }
 
   void SetupExchangeData(ui::OSExchangeData* data) {
@@ -221,8 +219,8 @@ class SynchronousDrag : public ui::DragSourceWin {
     return grid_view_pt;
   }
 
-  app_list::AppsGridView* grid_view_;
-  app_list::AppListItemView* drag_view_;
+  AppsGridView* grid_view_;
+  AppListItemView* drag_view_;
   gfx::Point drag_view_offset_;
   bool has_shortcut_path_;
   base::FilePath shortcut_path_;
diff --git a/ui/app_list/views/apps_grid_view.h b/ui/app_list/views/apps_grid_view.h
index 9c20164..59e4173 100644
--- a/ui/app_list/views/apps_grid_view.h
+++ b/ui/app_list/views/apps_grid_view.h
@@ -135,7 +135,7 @@ class APP_LIST_EXPORT AppsGridView : public views::View,
   }
 
  private:
-  friend class app_list::test::AppsGridViewTestApi;
+  friend class test::AppsGridViewTestApi;
 
   // Represents the index to an item view in the grid.
   struct Index {
diff --git a/ui/app_list/views/contents_view.cc b/ui/app_list/views/contents_view.cc
index 5211eb1..7d14d17 100644
--- a/ui/app_list/views/contents_view.cc
+++ b/ui/app_list/views/contents_view.cc
@@ -77,7 +77,7 @@ ContentsView::~ContentsView() {
 }
 
 void ContentsView::SetDragAndDropHostOfCurrentAppList(
-    app_list::ApplicationDragAndDropHost* drag_and_drop_host) {
+    ApplicationDragAndDropHost* drag_and_drop_host) {
   apps_grid_view_->SetDragAndDropHostOfCurrentAppList(drag_and_drop_host);
 }
 
diff --git a/ui/app_list/views/contents_view.h b/ui/app_list/views/contents_view.h
index f0b974c..4cc42da 100644
--- a/ui/app_list/views/contents_view.h
+++ b/ui/app_list/views/contents_view.h
@@ -37,7 +37,7 @@ class ContentsView : public views::View {
   // If |drag_and_drop| is not NULL it will be called upon drag and drop
   // operations outside the application list.
   void SetDragAndDropHostOfCurrentAppList(
-      app_list::ApplicationDragAndDropHost* drag_and_drop_host);
+      ApplicationDragAndDropHost* drag_and_drop_host);
 
   void ShowSearchResults(bool show);
 
diff --git a/ui/app_list/views/page_switcher.cc b/ui/app_list/views/page_switcher.cc
index 665b023..f8690a7 100644
--- a/ui/app_list/views/page_switcher.cc
+++ b/ui/app_list/views/page_switcher.cc
@@ -15,6 +15,8 @@
 #include "ui/views/controls/button/custom_button.h"
 #include "ui/views/layout/box_layout.h"
 
+namespace app_list {
+
 namespace {
 
 const int kPreferredHeight = 57;
@@ -52,11 +54,10 @@ class PageSwitcherButton : public views::CustomButton {
   }
 
   virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE {
-    if (state() == STATE_HOVERED) {
-      PaintButton(canvas, app_list::kPagerHoverColor);
-    } else {
-      PaintButton(canvas, app_list::kPagerNormalColor);
-    }
+    if (state() == STATE_HOVERED)
+      PaintButton(canvas, kPagerHoverColor);
+    else
+      PaintButton(canvas, kPagerNormalColor);
   }
 
  private:
@@ -94,7 +95,7 @@ class PageSwitcherButton : public views::CustomButton {
       selected_path.addRoundRect(gfx::RectToSkRect(selected_rect),
                                  SkIntToScalar(kButtonCornerRadius),
                                  SkIntToScalar(kButtonCornerRadius));
-      paint.setColor(app_list::kPagerSelectedColor);
+      paint.setColor(kPagerSelectedColor);
       canvas->DrawPath(selected_path, paint);
     }
   }
@@ -116,8 +117,6 @@ PageSwitcherButton* GetButtonByIndex(views::View* buttons, int index) {
 
 }  // namespace
 
-namespace app_list {
-
 PageSwitcher::PageSwitcher(PaginationModel* model)
     : model_(model),
       buttons_(new views::View) {
diff --git a/ui/app_list/views/search_result_view.cc b/ui/app_list/views/search_result_view.cc
index 55b9e0b..9e7fe51 100644
--- a/ui/app_list/views/search_result_view.cc
+++ b/ui/app_list/views/search_result_view.cc
@@ -20,6 +20,8 @@
 #include "ui/views/controls/menu/menu_item_view.h"
 #include "ui/views/controls/menu/menu_runner.h"
 
+namespace app_list {
+
 namespace {
 
 const int kPreferredWidth = 300;
@@ -36,24 +38,24 @@ const int kActionButtonRightMargin = 8;
 // Creates a RenderText of given |text| and |styles|. Caller takes ownership
 // of returned RenderText.
 gfx::RenderText* CreateRenderText(const base::string16& text,
-                                  const app_list::SearchResult::Tags& tags) {
+                                  const SearchResult::Tags& tags) {
   gfx::RenderText* render_text = gfx::RenderText::CreateInstance();
   render_text->SetText(text);
-  render_text->SetColor(app_list::kResultDefaultTextColor);
+  render_text->SetColor(kResultDefaultTextColor);
 
-  for (app_list::SearchResult::Tags::const_iterator it = tags.begin();
+  for (SearchResult::Tags::const_iterator it = tags.begin();
        it != tags.end();
        ++it) {
     // NONE means default style so do nothing.
-    if (it->styles == app_list::SearchResult::Tag::NONE)
+    if (it->styles == SearchResult::Tag::NONE)
       continue;
 
-    if (it->styles & app_list::SearchResult::Tag::MATCH)
+    if (it->styles & SearchResult::Tag::MATCH)
       render_text->ApplyStyle(gfx::BOLD, true, it->range);
-    if (it->styles & app_list::SearchResult::Tag::DIM)
-      render_text->ApplyColor(app_list::kResultDimmedTextColor, it->range);
-    else if (it->styles & app_list::SearchResult::Tag::URL)
-      render_text->ApplyColor(app_list::kResultURLTextColor, it->range);
+    if (it->styles & SearchResult::Tag::DIM)
+      render_text->ApplyColor(kResultDimmedTextColor, it->range);
+    else if (it->styles & SearchResult::Tag::URL)
+      render_text->ApplyColor(kResultURLTextColor, it->range);
   }
 
   return render_text;
@@ -61,8 +63,6 @@ gfx::RenderText* CreateRenderText(const base::string16& text,
 
 }  // namespace
 
-namespace app_list {
-
 // static
 const char SearchResultView::kViewClassName[] = "ui/app_list/SearchResultView";