diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-04 04:12:43 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-04 04:12:43 +0000 |
| commit | 7d1d20951e7de62096b76818d4c6de3c86786851 (patch) | |
| tree | edd5e2dabd36d080f938240240a11fad14fba306 /apps | |
| parent | e430a7ceeb0d3b368ab3ec2b2b90b4750ec18f46 (diff) | |
| download | chromium_src-7d1d20951e7de62096b76818d4c6de3c86786851.zip chromium_src-7d1d20951e7de62096b76818d4c6de3c86786851.tar.gz chromium_src-7d1d20951e7de62096b76818d4c6de3c86786851.tar.bz2 | |
apps: Stop depending on chrome_switches.h
Instead move kShowAppListShortcut to a new apps_switches.h
BUG=159366
R=benwells@chromium.org
Review URL: https://chromiumcodereview.appspot.com/12391047
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@185833 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/DEPS | 1 | ||||
| -rw-r--r-- | apps/app_launcher.cc | 2 | ||||
| -rw-r--r-- | apps/apps.gypi | 2 | ||||
| -rw-r--r-- | apps/switches.cc | 14 | ||||
| -rw-r--r-- | apps/switches.h | 16 |
5 files changed, 33 insertions, 2 deletions
@@ -8,7 +8,6 @@ include_rules = [ "+chrome/browser/profiles", "+chrome/browser/ui/host_desktop.h", "+chrome/common/chrome_notification_types.h", - "+chrome/common/chrome_switches.h", "+chrome/common/extensions", "+chrome/installer", ] diff --git a/apps/app_launcher.cc b/apps/app_launcher.cc index 7ad4578..b5c5fe9 100644 --- a/apps/app_launcher.cc +++ b/apps/app_launcher.cc @@ -5,13 +5,13 @@ #include "apps/app_launcher.h" #include "apps/pref_names.h" +#include "apps/switches.h" #include "base/command_line.h" #include "base/prefs/pref_registry_simple.h" #include "base/prefs/pref_service.h" #include "base/threading/sequenced_worker_pool.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/ui/host_desktop.h" -#include "chrome/common/chrome_switches.h" #include "content/public/browser/browser_thread.h" #if defined(OS_WIN) diff --git a/apps/apps.gypi b/apps/apps.gypi index 4bee420..7cd349b 100644 --- a/apps/apps.gypi +++ b/apps/apps.gypi @@ -32,6 +32,8 @@ 'pref_names.h', 'prefs.cc', 'prefs.h', + 'switches.cc', + 'switches.h', ], 'conditions': [ ['enable_extensions==0', { diff --git a/apps/switches.cc b/apps/switches.cc new file mode 100644 index 0000000..f5051c9 --- /dev/null +++ b/apps/switches.cc @@ -0,0 +1,14 @@ +// Copyright 2013 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "apps/switches.h" + +namespace apps { +namespace switches { + +// If true an app list shortcut will be shown in the taskbar. +const char kShowAppListShortcut[] = "show-app-list-shortcut"; + +} // namespace switches +} // namespace apps diff --git a/apps/switches.h b/apps/switches.h new file mode 100644 index 0000000..c9ff965 --- /dev/null +++ b/apps/switches.h @@ -0,0 +1,16 @@ +// Copyright 2013 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#ifndef APPS_SWITCHES_H_ +#define APPS_SWITCHES_H_ + +namespace apps { +namespace switches { + +extern const char kShowAppListShortcut[]; + +} // namespace switches +} // namespace apps + +#endif // APPS_SWITCHES_H_ |