app_list: Fix the header include guards.

BUG=125846
TBR=ben@chromium.org

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

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

chrome/browser/ui/ash/app_list/app_list_view_delegate.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_UI_VIEWS_ASH_APP_LIST_APP_LIST_VIEW_DELEGATE_H_
-#define CHROME_BROWSER_UI_VIEWS_ASH_APP_LIST_APP_LIST_VIEW_DELEGATE_H_
+#ifndef CHROME_BROWSER_UI_ASH_APP_LIST_APP_LIST_VIEW_DELEGATE_H_
+#define CHROME_BROWSER_UI_ASH_APP_LIST_APP_LIST_VIEW_DELEGATE_H_
 
 #include <string>
 
@@ -37,4 +37,4 @@ class AppListViewDelegate : public app_list::AppListViewDelegate {
   DISALLOW_COPY_AND_ASSIGN(AppListViewDelegate);
 };
 
-#endif  // CHROME_BROWSER_UI_VIEWS_ASH_APP_LIST_APP_LIST_VIEW_DELEGATE_H_
+#endif  // CHROME_BROWSER_UI_ASH_APP_LIST_APP_LIST_VIEW_DELEGATE_H_

chrome/browser/ui/ash/app_list/apps_model_builder.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_UI_VIEWS_ASH_APP_LIST_APPS_MODEL_BUILDER_H_
-#define CHROME_BROWSER_UI_VIEWS_ASH_APP_LIST_APPS_MODEL_BUILDER_H_
+#ifndef CHROME_BROWSER_UI_ASH_APP_LIST_APPS_MODEL_BUILDER_H_
+#define CHROME_BROWSER_UI_ASH_APP_LIST_APPS_MODEL_BUILDER_H_
 
 #include <string>
 #include <vector>
@@ -66,4 +66,4 @@ class AppsModelBuilder : public content::NotificationObserver {
   DISALLOW_COPY_AND_ASSIGN(AppsModelBuilder);
 };
 
-#endif  // CHROME_BROWSER_UI_VIEWS_ASH_APP_LIST_APPS_MODEL_BUILDER_H_
+#endif  // CHROME_BROWSER_UI_ASH_APP_LIST_APPS_MODEL_BUILDER_H_

chrome/browser/ui/ash/app_list/chrome_app_list_item.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_UI_VIEWS_ASH_APP_LIST_CHROME_APP_LIST_ITEM_H_
-#define CHROME_BROWSER_UI_VIEWS_ASH_APP_LIST_CHROME_APP_LIST_ITEM_H_
+#ifndef CHROME_BROWSER_UI_ASH_APP_LIST_CHROME_APP_LIST_ITEM_H_
+#define CHROME_BROWSER_UI_ASH_APP_LIST_CHROME_APP_LIST_ITEM_H_
 
 #include "ui/app_list/app_list_item_model.h"
 
@@ -21,9 +21,7 @@ class ChromeAppListItem : public app_list::AppListItemModel {
   // associated with this activation.
   virtual void Activate(int event_flags) = 0;
 
-  Type type() const {
-    return type_;
-  }
+  Type type() const { return type_; }
 
  protected:
   explicit ChromeAppListItem(Type type) : type_(type) {}
@@ -35,4 +33,4 @@ class ChromeAppListItem : public app_list::AppListItemModel {
   DISALLOW_COPY_AND_ASSIGN(ChromeAppListItem);
 };
 
-#endif  // CHROME_BROWSER_UI_VIEWS_ASH_APP_LIST_CHROME_APP_LIST_ITEM_H_
+#endif  // CHROME_BROWSER_UI_ASH_APP_LIST_CHROME_APP_LIST_ITEM_H_

chrome/browser/ui/ash/app_list/extension_app_item.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_UI_VIEWS_ASH_APP_LIST_EXTENSION_APP_ITEM_H_
-#define CHROME_BROWSER_UI_VIEWS_ASH_APP_LIST_EXTENSION_APP_ITEM_H_
+#ifndef CHROME_BROWSER_UI_ASH_APP_LIST_EXTENSION_APP_ITEM_H_
+#define CHROME_BROWSER_UI_ASH_APP_LIST_EXTENSION_APP_ITEM_H_
 
 #include <string>
 
@@ -71,4 +71,4 @@ class ExtensionAppItem : public ChromeAppListItem,
   DISALLOW_COPY_AND_ASSIGN(ExtensionAppItem);
 };
 
-#endif  // CHROME_BROWSER_UI_VIEWS_ASH_APP_LIST_EXTENSION_APP_ITEM_H_
+#endif  // CHROME_BROWSER_UI_ASH_APP_LIST_EXTENSION_APP_ITEM_H_

chrome/browser/ui/ash/app_list/search_builder.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_UI_VIEWS_ASH_APP_LIST_SEARCH_BUILDER_H_
-#define CHROME_BROWSER_UI_VIEWS_ASH_APP_LIST_SEARCH_BUILDER_H_
+#ifndef CHROME_BROWSER_UI_ASH_APP_LIST_SEARCH_BUILDER_H_
+#define CHROME_BROWSER_UI_ASH_APP_LIST_SEARCH_BUILDER_H_
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
@@ -58,4 +58,4 @@ class SearchBuilder : public AutocompleteControllerDelegate {
   DISALLOW_COPY_AND_ASSIGN(SearchBuilder);
 };
 
-#endif  // CHROME_BROWSER_UI_VIEWS_ASH_APP_LIST_SEARCH_BUILDER_H_
+#endif  // CHROME_BROWSER_UI_ASH_APP_LIST_SEARCH_BUILDER_H_