summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-04 02:55:00 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-04 02:55:00 +0000
commiteb5c96871668a7952c24c1266005c4d3cbdcb005 (patch)
treecb42818088eb41adc48257d8829a28b8f717af24 /apps
parent5f7782681d493f1da3cf625cfa24dc99968f1c12 (diff)
downloadchromium_src-eb5c96871668a7952c24c1266005c4d3cbdcb005.zip
chromium_src-eb5c96871668a7952c24c1266005c4d3cbdcb005.tar.gz
chromium_src-eb5c96871668a7952c24c1266005c4d3cbdcb005.tar.bz2
apps: Silence cpplint warnings.
BUG=None TEST=cpplint apps/ are clean. R=benwells@chromium.org Review URL: https://chromiumcodereview.appspot.com/12377067 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@185828 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'apps')
-rw-r--r--apps/app_launcher.h11
-rw-r--r--apps/app_restore_service.h9
-rw-r--r--apps/app_restore_service_factory.h6
-rw-r--r--apps/apps.gypi4
4 files changed, 15 insertions, 15 deletions
diff --git a/apps/app_launcher.h b/apps/app_launcher.h
index b6bbed3..d3156a1 100644
--- a/apps/app_launcher.h
+++ b/apps/app_launcher.h
@@ -2,14 +2,11 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROME_APPS_APP_LAUNCHER_H_
-#define CHROME_APPS_APP_LAUNCHER_H_
+#ifndef APPS_APP_LAUNCHER_H_
+#define APPS_APP_LAUNCHER_H_
-#include "base/basictypes.h"
#include "base/callback_forward.h"
-class PrefRegistrySimple;
-
namespace apps {
// Called on the UI thread after determining if the launcher is enabled. A
@@ -33,6 +30,6 @@ void GetIsAppLauncherEnabled(
// Returns whether the app launcher was enabled the last time it was checked.
bool WasAppLauncherEnabled();
-} // namespace extensions
+} // namespace apps
-#endif // CHROME_APPS_APP_LAUNCHER_H_
+#endif // APPS_APP_LAUNCHER_H_
diff --git a/apps/app_restore_service.h b/apps/app_restore_service.h
index 0217f60..a308c31 100644
--- a/apps/app_restore_service.h
+++ b/apps/app_restore_service.h
@@ -2,10 +2,11 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROME_BROWSER_EXTENSIONS_APP_RESTORE_SERVICE_H_
-#define CHROME_BROWSER_EXTENSIONS_APP_RESTORE_SERVICE_H_
+#ifndef APPS_APP_RESTORE_SERVICE_H_
+#define APPS_APP_RESTORE_SERVICE_H_
#include <string>
+#include <vector>
#include "chrome/browser/profiles/profile_keyed_service.h"
#include "content/public/browser/notification_observer.h"
@@ -50,8 +51,10 @@ class AppRestoreService : public ProfileKeyedService,
content::NotificationRegistrar registrar_;
Profile* profile_;
+
+ DISALLOW_COPY_AND_ASSIGN(AppRestoreService);
};
} // namespace apps
-#endif // CHROME_BROWSER_EXTENSIONS_APP_RESTORE_SERVICE_H_
+#endif // APPS_APP_RESTORE_SERVICE_H_
diff --git a/apps/app_restore_service_factory.h b/apps/app_restore_service_factory.h
index cf17ff2..c17e845 100644
--- a/apps/app_restore_service_factory.h
+++ b/apps/app_restore_service_factory.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_EXTENSIONS_APP_RESTORE_SERVICE_FACTORY_H_
-#define CHROME_BROWSER_EXTENSIONS_APP_RESTORE_SERVICE_FACTORY_H_
+#ifndef APPS_APP_RESTORE_SERVICE_FACTORY_H_
+#define APPS_APP_RESTORE_SERVICE_FACTORY_H_
#include "base/memory/singleton.h"
#include "chrome/browser/profiles/profile_keyed_service_factory.h"
@@ -39,4 +39,4 @@ class AppRestoreServiceFactory : public ProfileKeyedServiceFactory {
} // namespace apps
-#endif // CHROME_BROWSER_EXTENSIONS_APP_RESTORE_SERVICE_FACTORY_H_
+#endif // APPS_APP_RESTORE_SERVICE_FACTORY_H_
diff --git a/apps/apps.gypi b/apps/apps.gypi
index 76bca7e..4bee420 100644
--- a/apps/apps.gypi
+++ b/apps/apps.gypi
@@ -51,8 +51,8 @@
'target_name': 'app_host',
'type': 'executable',
'include_dirs': [
- '..',
- ],
+ '..',
+ ],
'direct_dependent_settings': {
'include_dirs': [
'..',