diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-25 20:09:00 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-25 20:09:00 +0000 |
| commit | 2bf5a6a82f3ac8adbf25f57f0f3f7f2648842c2f (patch) | |
| tree | 3a5778fb416aa101303b06bc73a96b63b87f779f /chrome | |
| parent | 5d4c422a0fbbc4393b4e816d4f0f3b6472cd0377 (diff) | |
| download | chromium_src-2bf5a6a82f3ac8adbf25f57f0f3f7f2648842c2f.zip chromium_src-2bf5a6a82f3ac8adbf25f57f0f3f7f2648842c2f.tar.gz chromium_src-2bf5a6a82f3ac8adbf25f57f0f3f7f2648842c2f.tar.bz2 | |
Clean up a few unused globals.
Found by clang's new -Wunused-const-variable.
BUG=290204
R=akalin@chromium.org, brettw@chromium.org, sergeyu@chromium.org, thestig@chromium.org
Review URL: https://codereview.chromium.org/24616002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@225235 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/common/chrome_paths.cc | 10 | ||||
| -rw-r--r-- | chrome/common/chrome_switches.cc | 2 | ||||
| -rw-r--r-- | chrome/common/pref_names.cc | 27 | ||||
| -rw-r--r-- | chrome/installer/gcapi_mac/gcapi.mm | 3 |
4 files changed, 4 insertions, 38 deletions
diff --git a/chrome/common/chrome_paths.cc b/chrome/common/chrome_paths.cc index 4f6314a..4238481 100644 --- a/chrome/common/chrome_paths.cc +++ b/chrome/common/chrome_paths.cc @@ -64,16 +64,10 @@ const base::FilePath::CharType kInternalNaClPluginFileName[] = FILE_PATH_LITERAL("libppGoogleNaClPluginChrome.so"); #endif +#if defined(OS_POSIX) && !defined(OS_MACOSX) + const base::FilePath::CharType kEffectsPluginFileName[] = -#if defined(OS_WIN) - FILE_PATH_LITERAL("pepper/libppeffects.dll"); -#elif defined(OS_MACOSX) - FILE_PATH_LITERAL("pepper/libppeffects.plugin"); -#else // Linux and Chrome OS FILE_PATH_LITERAL("pepper/libppeffects.so"); -#endif - -#if defined(OS_POSIX) && !defined(OS_MACOSX) const base::FilePath::CharType kO3DPluginFileName[] = FILE_PATH_LITERAL("pepper/libppo3dautoplugin.so"); diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc index 6a735be..2a6f133 100644 --- a/chrome/common/chrome_switches.cc +++ b/chrome/common/chrome_switches.cc @@ -1134,8 +1134,10 @@ const char kPrerenderModeSwitchValueEnabled[] = "enabled"; // prefetch_only: No prerendering, but enables prefetching. const char kPrerenderModeSwitchValuePrefetchOnly[] = "prefetch_only"; +#if defined(OS_WIN) // Enable conversion from vector to raster for any page. const char kPrintRaster[] = "print-raster"; +#endif // Use IPv6 only for privet HTTP. const char kPrivetIPv6Only[] = "privet-ipv6-only"; diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc index 1bb269b..1ff7bde 100644 --- a/chrome/common/pref_names.cc +++ b/chrome/common/pref_names.cc @@ -1703,33 +1703,6 @@ const char kNtpPromoDesktopSessionFound[] = "ntp.promo_desktop_session_found"; // Boolean indicating whether the web store is active for the current locale. const char kNtpWebStoreEnabled[] = "ntp.webstore_enabled"; -// The id of the last web store promo actually displayed on the NTP. -const char kNtpWebStorePromoLastId[] = "ntp.webstore_last_promo_id"; - -// The id of the current web store promo. -const char kNtpWebStorePromoId[] = "ntp.webstorepromo.id"; - -// The header line for the NTP web store promo. -const char kNtpWebStorePromoHeader[] = "ntp.webstorepromo.header"; - -// The button text for the NTP web store promo. -const char kNtpWebStorePromoButton[] = "ntp.webstorepromo.button"; - -// The button link for the NTP web store promo. -const char kNtpWebStorePromoLink[] = "ntp.webstorepromo.link"; - -// The image URL for the NTP web store promo logo. -const char kNtpWebStorePromoLogo[] = "ntp.webstorepromo.logo"; - -// The original URL for the NTP web store promo logo. -const char kNtpWebStorePromoLogoSource[] = "ntp.webstorepromo.logo_source"; - -// The "hide this" link text for the NTP web store promo. -const char kNtpWebStorePromoExpire[] = "ntp.webstorepromo.expire"; - -// Specifies what users should maximize the NTP web store promo. -const char kNtpWebStorePromoUserGroup[] = "ntp.webstorepromo.usergroup"; - // Customized app page names that appear on the New Tab Page. const char kNtpAppPageNames[] = "ntp.app_page_names"; diff --git a/chrome/installer/gcapi_mac/gcapi.mm b/chrome/installer/gcapi_mac/gcapi.mm index b5852bb..1ca5839 100644 --- a/chrome/installer/gcapi_mac/gcapi.mm +++ b/chrome/installer/gcapi_mac/gcapi.mm @@ -34,9 +34,6 @@ NSString* const kUserMasterPrefsPath = @"~~/Library/Application Support/Google/Chrome/" "Google Chrome Master Preferences"; -NSString* const kChannelKey = @"KSChannelID"; -NSString* const kVersionKey = @"KSVersion"; - // Condensed from chromium's base/mac/mac_util.mm. bool IsOSXVersionSupported() { // On 10.6, Gestalt() was observed to be able to spawn threads (see |