diff options
| -rw-r--r-- | chrome/browser/first_run/first_run.cc | 2 | ||||
| -rw-r--r-- | chrome/common/chrome_constants.cc | 20 | ||||
| -rw-r--r-- | chrome/common/chrome_constants.h | 18 | ||||
| -rw-r--r-- | chrome/common/chrome_switches.cc | 98 | ||||
| -rw-r--r-- | chrome/common/chrome_switches.h | 35 | ||||
| -rw-r--r-- | chrome/common/env_vars.cc | 10 | ||||
| -rw-r--r-- | chrome/common/env_vars.h | 6 | ||||
| -rw-r--r-- | chrome/common/local_discovery/service_discovery_client_impl.h | 2 | ||||
| -rw-r--r-- | chrome/common/pref_names.cc | 99 | ||||
| -rw-r--r-- | chrome/common/pref_names.h | 51 | ||||
| -rw-r--r-- | chrome/common/tts_utterance_request.cc | 7 | ||||
| -rw-r--r-- | chrome/common/tts_utterance_request.h | 7 | ||||
| -rw-r--r-- | chrome/common/url_constants.cc | 55 | ||||
| -rw-r--r-- | chrome/common/url_constants.h | 57 | ||||
| -rw-r--r-- | chrome/installer/util/util_constants.cc | 9 | ||||
| -rw-r--r-- | chrome/installer/util/util_constants.h | 6 |
16 files changed, 190 insertions, 292 deletions
diff --git a/chrome/browser/first_run/first_run.cc b/chrome/browser/first_run/first_run.cc index 26ef116..671799c 100644 --- a/chrome/browser/first_run/first_run.cc +++ b/chrome/browser/first_run/first_run.cc @@ -376,9 +376,11 @@ void FirstRunBubbleLauncher::Observe( } if (contents && contents->GetURL().SchemeIs(content::kChromeUIScheme)) { +#if defined(OS_WIN) // Suppress the first run bubble if 'make chrome metro' flow is showing. if (contents->GetURL().host() == chrome::kChromeUIMetroFlowHost) return; +#endif // Suppress the first run bubble if the NTP sync promo bubble is showing // or if sign in is in progress. diff --git a/chrome/common/chrome_constants.cc b/chrome/common/chrome_constants.cc index db0d5cb..bab2b24 100644 --- a/chrome/common/chrome_constants.cc +++ b/chrome/common/chrome_constants.cc @@ -21,7 +21,9 @@ namespace chrome { +#if defined(OS_WIN) const char kChromeVersionEnvVar[] = "CHROME_VERSION"; +#endif // The following should not be used for UI strings; they are meant // for system strings only. UI changes should be made in the GRD. @@ -124,17 +126,16 @@ const char* const kHelperFlavorSuffixes[] = { #endif // OS_MACOSX #if defined(OS_WIN) +const base::FilePath::CharType kBrowserResourcesDll[] = FPL("chrome.dll"); const base::FilePath::CharType kMetroDriverDll[] = FPL("metro_driver.dll"); -const wchar_t kStatusTrayWindowClass[] = L"Chrome_StatusTrayWindow"; +const base::FilePath::CharType kStatusTrayWindowClass[] = + FPL("Chrome_StatusTrayWindow"); #endif // defined(OS_WIN) -const wchar_t kCrashReportLog[] = L"Reported Crashes.txt"; -const wchar_t kTestingInterfaceDLL[] = L"testing_interface.dll"; const char kInitialProfile[] = "Default"; const char kMultiProfileDirPrefix[] = "Profile "; const base::FilePath::CharType kGuestProfileDir[] = FPL("Guest Profile"); const base::FilePath::CharType kSystemProfileDir[] = FPL("System Profile"); -const wchar_t kBrowserResourcesDll[] = L"chrome.dll"; // filenames const base::FilePath::CharType kAffiliationDatabaseFileName[] = @@ -152,15 +153,12 @@ const base::FilePath::CharType kExtensionsCookieFilename[] = FPL("Extension Cookies"); const base::FilePath::CharType kFirstRunSentinel[] = FPL("First Run"); const base::FilePath::CharType kGCMStoreDirname[] = FPL("GCM Store"); -const base::FilePath::CharType kJumpListIconDirname[] = FPL("JumpListIcons"); const base::FilePath::CharType kLocalStateFilename[] = FPL("Local State"); const base::FilePath::CharType kLocalStorePoolName[] = FPL("LocalStorePool"); const base::FilePath::CharType kLoginDataFileName[] = FPL("Login Data"); const base::FilePath::CharType kMediaCacheDirname[] = FPL("Media Cache"); const base::FilePath::CharType kNetworkPersistentStateFilename[] = FPL("Network Persistent State"); -const base::FilePath::CharType kNewTabThumbnailsFilename[] = - FPL("Top Thumbnails"); const base::FilePath::CharType kPreferencesFilename[] = FPL("Preferences"); const base::FilePath::CharType kProtectedPreferencesFilenameDeprecated[] = FPL("Protected Preferences"); @@ -180,11 +178,13 @@ const base::FilePath::CharType kSingletonSocketFilename[] = FPL("SingletonSocket"); const base::FilePath::CharType kSupervisedUserSettingsFilename[] = FPL("Managed Mode Settings"); -const base::FilePath::CharType kSyncCredentialsFilename[] = - FPL("Sync Credentials"); const base::FilePath::CharType kThemePackFilename[] = FPL("Cached Theme.pak"); const base::FilePath::CharType kWebAppDirname[] = FPL("Web Applications"); +#if defined(OS_WIN) +const base::FilePath::CharType kJumpListIconDirname[] = FPL("JumpListIcons"); +#endif + // File name of the Pepper Flash plugin on different platforms. const base::FilePath::CharType kPepperFlashPluginFilename[] = #if defined(OS_MACOSX) @@ -196,7 +196,9 @@ const base::FilePath::CharType kPepperFlashPluginFilename[] = #endif // directory names +#if defined(OS_WIN) const wchar_t kUserDataDirname[] = L"User Data"; +#endif const float kMaxShareOfExtensionProcesses = 0.30f; diff --git a/chrome/common/chrome_constants.h b/chrome/common/chrome_constants.h index 85f09e7..156fbd8 100644 --- a/chrome/common/chrome_constants.h +++ b/chrome/common/chrome_constants.h @@ -23,7 +23,9 @@ namespace chrome { extern const char kChromeVersion[]; +#if defined(OS_WIN) extern const char kChromeVersionEnvVar[]; +#endif extern const base::FilePath::CharType kBrowserProcessExecutableName[]; extern const base::FilePath::CharType kHelperProcessExecutableName[]; @@ -51,16 +53,15 @@ extern const base::FilePath::CharType kFrameworkName[]; extern const base::FilePath::CharType* const kHelperFlavorSuffixes[]; #endif // OS_MACOSX #if defined(OS_WIN) +extern const base::FilePath::CharType kBrowserResourcesDll[]; extern const base::FilePath::CharType kMetroDriverDll[]; -extern const wchar_t kStatusTrayWindowClass[]; +extern const base::FilePath::CharType kStatusTrayWindowClass[]; #endif // defined(OS_WIN) -extern const wchar_t kCrashReportLog[]; -extern const wchar_t kTestingInterfaceDLL[]; + extern const char kInitialProfile[]; extern const char kMultiProfileDirPrefix[]; extern const base::FilePath::CharType kGuestProfileDir[]; extern const base::FilePath::CharType kSystemProfileDir[]; -extern const wchar_t kBrowserResourcesDll[]; // filenames extern const base::FilePath::CharType kAffiliationDatabaseFileName[]; @@ -73,13 +74,11 @@ extern const base::FilePath::CharType kExtensionActivityLogFilename[]; extern const base::FilePath::CharType kExtensionsCookieFilename[]; extern const base::FilePath::CharType kFirstRunSentinel[]; extern const base::FilePath::CharType kGCMStoreDirname[]; -extern const base::FilePath::CharType kJumpListIconDirname[]; extern const base::FilePath::CharType kLocalStateFilename[]; extern const base::FilePath::CharType kLocalStorePoolName[]; extern const base::FilePath::CharType kLoginDataFileName[]; extern const base::FilePath::CharType kMediaCacheDirname[]; extern const base::FilePath::CharType kNetworkPersistentStateFilename[]; -extern const base::FilePath::CharType kNewTabThumbnailsFilename[]; extern const base::FilePath::CharType kPreferencesFilename[]; extern const base::FilePath::CharType kProtectedPreferencesFilenameDeprecated[]; extern const base::FilePath::CharType kReadmeFilename[]; @@ -92,15 +91,20 @@ extern const base::FilePath::CharType kSingletonCookieFilename[]; extern const base::FilePath::CharType kSingletonLockFilename[]; extern const base::FilePath::CharType kSingletonSocketFilename[]; extern const base::FilePath::CharType kSupervisedUserSettingsFilename[]; -extern const base::FilePath::CharType kSyncCredentialsFilename[]; extern const base::FilePath::CharType kThemePackFilename[]; extern const base::FilePath::CharType kWebAppDirname[]; +#if defined(OS_WIN) +extern const base::FilePath::CharType kJumpListIconDirname[]; +#endif + // File name of the Pepper Flash plugin on different platforms. extern const base::FilePath::CharType kPepperFlashPluginFilename[]; // directory names +#if defined(OS_WIN) extern const wchar_t kUserDataDirname[]; +#endif // Fraction of the total number of processes to be used for hosting // extensions. If we have more extensions than this percentage, we will start diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc index 476b22f..5417ced 100644 --- a/chrome/common/chrome_switches.cc +++ b/chrome/common/chrome_switches.cc @@ -502,9 +502,6 @@ const char kEnablePowerOverlay[] = "enable-power-overlay"; const char kEnablePrintPreviewRegisterPromos[] = "enable-print-preview-register-promos"; -// Enable Privet storage. -const char kEnablePrivetStorage[] = "enable-privet-storage"; - // Enables tracking of tasks in profiler for viewing via about:profiler. // To predominantly disable tracking (profiling), use the command line switch: // --enable-profiling=0 @@ -526,16 +523,9 @@ const char kEnableQuicPacing[] = "enable-quic-pacing"; // This only has an effect if QUIC protocol is enabled. const char kEnableQuicPortSelection[] = "enable-quic-port-selection"; -// Enables context-sensitive reader mode button in the toolbar. -const char kEnableReaderModeToolbarIcon[] = - "enable-reader-mode-toolbar-icon"; - // Enables save password prompt bubble. const char kEnableSavePasswordBubble[] = "enable-save-password-bubble"; -// Enables SDCH for https schemes. -const char kEnableSdchOverHttps[] = "enable-sdch-over-https"; - // Enables SDCH persistence. const char kEnableSdchPersistence[] = "enable-sdch-persistence"; @@ -571,9 +561,6 @@ const char kEnableTabAudioMuting[] = "enable-tab-audio-muting"; // instant-extended-api, where thumbnails are generally smaller. const char kEnableThumbnailRetargeting[] = "enable-thumbnail-retargeting"; -// Enables Translate experimental new UX which replaces the infobar. -const char kEnableTranslateNewUX[] = "enable-translate-new-ux"; - // Enables Alternate-Protocol when the port is user controlled (> 1024). const char kEnableUserAlternateProtocolPorts[] = "enable-user-controlled-alternate-protocol-ports"; @@ -649,17 +636,6 @@ const char kForceFirstRun[] = "force-first-run"; // prefixed with the character "t" will be treated as Trigger Variation Ids. const char kForceVariationIds[] = "force-variation-ids"; -// These flags show the man page on Linux. They are equivalent to each -// other. -const char kHelp[] = "help"; -const char kHelpShort[] = "h"; - -// Makes Windows happy by allowing it to show "Enable access to this program" -// checkbox in Add/Remove Programs->Set Program Access and Defaults. This only -// shows an error box because the only way to hide Chrome is by uninstalling -// it. -const char kHideIcons[] = "hide-icons"; - // Enables grouping websites by domain and filtering them by period. const char kHistoryEnableGroupByDomain[] = "enable-grouped-history"; @@ -731,9 +707,6 @@ const char kJavaScriptHarmony[] = "javascript-harmony"; // the given directory. Used primarily to gather samples for IPC fuzzing. const char kIpcDumpDirectory[] = "ipc-dump-directory"; -// Specifies the testcase used by the IPC fuzzer. -const char kIpcFuzzerTestcase[] = "ipc-fuzzer-testcase"; - // Used for testing - keeps browser alive after last browser window closes. const char kKeepAliveForTest[] = "keep-alive-for-test"; @@ -796,9 +769,6 @@ const char kNoDefaultBrowserCheck[] = "no-default-browser-check"; // page. This switch overrides this to block this lesser mixed-content problem. const char kNoDisplayingInsecureContent[] = "no-displaying-insecure-content"; -// Don't record/playback events when using record & playback. -const char kNoEvents[] = "no-events"; - // Disables all experiments set on about:flags. Does not disable about:flags // itself. Useful if an experiment makes chrome crash at startup: One can start // chrome with --no-experiments, disable the problematic lab at about:flags and @@ -811,10 +781,6 @@ const char kNoExperiments[] = "no-experiments"; // flag. const char kNoFirstRun[] = "no-first-run"; -// Whether or not the browser should warn if the profile is on a network share. -// This flag is only relevant for Windows currently. -const char kNoNetworkProfileWarning[] = "no-network-profile-warning"; - // Don't send hyperlink auditing pings const char kNoPings[] = "no-pings"; @@ -879,10 +845,6 @@ const char kPpapiFlashPath[] = "ppapi-flash-path"; // defaults to "10.2.999.999". const char kPpapiFlashVersion[] = "ppapi-flash-version"; -// Triggers prerendering of search base page to prefetch results for the typed -// omnibox query. Only has an effect when prerender is enabled. -const char kPrefetchSearchResults[] = "prefetch-search-results"; - // Triggers prerendering of pages from suggestions in the omnibox. Only has an // effect when Instant is either disabled or restricted to search, and when // prerender is enabled. @@ -1001,15 +963,9 @@ const char kSbDisableExtensionBlacklist[] = // Causes the process to run as a service process. const char kServiceProcess[] = "service"; -// Sets a token in the token service, for testing. -const char kSetToken[] = "set-token"; - // If true the app list will be shown. const char kShowAppList[] = "show-app-list"; -// See kHideIcons. -const char kShowIcons[] = "show-icons"; - // Command line flag offering a "Show saved copy" option to the user if offline. // The various modes are disabled, primary, or secondary. Primary/secondary // refers to button placement (for experiment). @@ -1153,9 +1109,6 @@ const char kTrustedSpdyProxy[] = "trusted-spdy-proxy"; // be used only by the upgrade process. const char kTryChromeAgain[] = "try-chrome-again"; -// Runs un-installation steps that were done by chrome first-run. -const char kUninstall[] = "uninstall"; - // Overrides per-origin quota settings to unlimited storage for any // apps/origins. This should be used only for testing purpose. const char kUnlimitedStorage[] = "unlimited-storage"; @@ -1234,6 +1187,13 @@ const char kEnableContextualSearch[] = "enable-contextual-search"; const char kEnableDomDistillerButtonAnimation[] = "enable-dom-distiller-button-animation"; +// Enables instant search clicks feature. +const char kEnableInstantSearchClicks[] = "enable-instant-search-clicks"; + +// Enables context-sensitive reader mode button in the toolbar. +const char kEnableReaderModeToolbarIcon[] = + "enable-reader-mode-toolbar-icon"; + // Enables zero suggest functionality on Dev channel, showing most visited // sites as default suggestions. const char kEnableZeroSuggestMostVisited[] = @@ -1244,16 +1204,21 @@ const char kEnableZeroSuggestMostVisited[] = const char kEnableZeroSuggestMostVisitedWithoutSerp[] = "enable-zero-suggest-most-visited-without-serp"; -// Enables instant search clicks feature. -const char kEnableInstantSearchClicks[] = "enable-instant-search-clicks"; - -#endif +// Triggers prerendering of search base page to prefetch results for the typed +// omnibox query. Only has an effect when prerender is enabled. +const char kPrefetchSearchResults[] = "prefetch-search-results"; +#endif // defined(OS_ANDROID) #if defined(USE_ASH) const char kOpenAsh[] = "open-ash"; #endif #if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_CHROMEOS) +// These flags show the man page on Linux. They are equivalent to each +// other. +const char kHelp[] = "help"; +const char kHelpShort[] = "h"; + // Specifies which password store to use (detect, default, gnome, kwallet). const char kPasswordStore[] = "password-store"; #endif @@ -1282,16 +1247,18 @@ const char kDisableHostedAppShimCreation[] = "disable-hosted-app-shim-creation"; const char kDisableSystemFullscreenForTesting[] = "disable-system-fullscreen-for-testing"; -// A process type (switches::kProcessType) that relaunches the browser. See -// chrome/browser/mac/relauncher.h. -const char kRelauncherProcess[] = "relauncher"; +// Enables Translate experimental new UX which replaces the infobar. +const char kEnableTranslateNewUX[] = "enable-translate-new-ux"; // This is how the metrics client ID is passed from the browser process to its // children. With Crashpad, the metrics client ID is distinct from the crash // client ID. const char kMetricsClientID[] = "metrics-client-id"; -#endif +// A process type (switches::kProcessType) that relaunches the browser. See +// chrome/browser/mac/relauncher.h. +const char kRelauncherProcess[] = "relauncher"; +#endif // defined(OS_MACOSX) // Use bubbles for content permissions requests instead of infobars. const char kEnablePermissionsBubbles[] = "enable-permissions-bubbles"; @@ -1308,13 +1275,29 @@ const char kEnableProfileShortcutManager[] = "enable-profile-shortcut-manager"; // Windows 8 and higher. Used when relaunching metro Chrome. const char kForceImmersive[] = "force-immersive"; +// Whether or not the browser should warn if the profile is on a network share. +// This flag is only relevant for Windows currently. +const char kNoNetworkProfileWarning[] = "no-network-profile-warning"; + // For the DelegateExecute verb handler to launch Chrome in desktop mode on // Windows 8 and higher. Used when relaunching metro Chrome. const char kForceDesktop[] = "force-desktop"; +// Makes Windows happy by allowing it to show "Enable access to this program" +// checkbox in Add/Remove Programs->Set Program Access and Defaults. This only +// shows an error box because the only way to hide Chrome is by uninstalling +// it. +const char kHideIcons[] = "hide-icons"; + // Relaunches metro Chrome on Windows 8 and higher using a given shortcut. const char kRelaunchShortcut[] = "relaunch-shortcut"; +// See kHideIcons. +const char kShowIcons[] = "show-icons"; + +// Runs un-installation steps that were done by chrome first-run. +const char kUninstall[] = "uninstall"; + // Requests that Chrome launch the Metro viewer process via the given appid // (which is assumed to be registered as default browser) and synchronously // connect to it. @@ -1326,6 +1309,11 @@ const char kWaitForMutex[] = "wait-for-mutex"; // Indicates that chrome was launched to service a search request in Windows 8. const char kWindows8Search[] = "windows8-search"; +#endif // defined(OS_WIN) + +#if defined(ENABLE_IPC_FUZZER) +// Specifies the testcase used by the IPC fuzzer. +const char kIpcFuzzerTestcase[] = "ipc-fuzzer-testcase"; #endif #if defined(ENABLE_PRINT_PREVIEW) && !defined(OFFICIAL_BUILD) diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h index 1e64324..bd42093 100644 --- a/chrome/common/chrome_switches.h +++ b/chrome/common/chrome_switches.h @@ -146,15 +146,12 @@ extern const char kEnablePluginPlaceholderShadowDom[]; extern const char kEnablePotentiallyAnnoyingSecurityFeatures[]; extern const char kEnablePowerOverlay[]; extern const char kEnablePrintPreviewRegisterPromos[]; -extern const char kEnablePrivetStorage[]; extern const char kEnableProfiling[]; extern const char kEnableQueryExtraction[]; extern const char kEnableQuic[]; extern const char kEnableQuicPacing[]; extern const char kEnableQuicPortSelection[]; -extern const char kEnableReaderModeToolbarIcon[]; extern const char kEnableSavePasswordBubble[]; -extern const char kEnableSdchOverHttps[]; extern const char kEnableSdchPersistence[]; extern const char kEnableSessionCrashedBubble[]; extern const char kEnableSettingsWindow[]; @@ -166,7 +163,6 @@ extern const char kEnableSupervisedUserManagedBookmarksFolder[]; extern const char kEnableSyncArticles[]; extern const char kEnableTabAudioMuting[]; extern const char kEnableThumbnailRetargeting[]; -extern const char kEnableTranslateNewUX[]; extern const char kEnableUserAlternateProtocolPorts[]; extern const char kEnableWebAppFrame[]; extern const char kEnableWebsiteSettingsManager[]; @@ -187,9 +183,6 @@ extern const char kForceAppMode[]; extern const char kForceFieldTrialParams[]; extern const char kForceFirstRun[]; extern const char kForceVariationIds[]; -extern const char kHelp[]; -extern const char kHelpShort[]; -extern const char kHideIcons[]; extern const char kHistoryEnableGroupByDomain[]; extern const char kHomePage[]; extern const char kHostRules[]; @@ -202,7 +195,6 @@ extern const char kInstallSupervisedUserWhitelists[]; extern const char kInstantProcess[]; extern const char kInvalidationUseGCMChannel[]; extern const char kIpcDumpDirectory[]; -extern const char kIpcFuzzerTestcase[]; extern const char kJavaScriptHarmony[]; extern const char kKeepAliveForTest[]; extern const char kKioskMode[]; @@ -223,10 +215,8 @@ extern const char kMonitoringDestinationID[]; extern const char kNetLogCaptureMode[]; extern const char kNoDefaultBrowserCheck[]; extern const char kNoDisplayingInsecureContent[]; -extern const char kNoEvents[]; extern const char kNoExperiments[]; extern const char kNoFirstRun[]; -extern const char kNoNetworkProfileWarning[]; extern const char kNoProxyServer[]; extern const char kNoPings[]; extern const char kNoServiceAutorun[]; @@ -243,7 +233,6 @@ extern const char kPermissionRequestApiScope[]; extern const char kPermissionRequestApiUrl[]; extern const char kPpapiFlashPath[]; extern const char kPpapiFlashVersion[]; -extern const char kPrefetchSearchResults[]; extern const char kPrerenderFromOmnibox[]; extern const char kPrerenderFromOmniboxSwitchValueAuto[]; extern const char kPrerenderFromOmniboxSwitchValueDisabled[]; @@ -274,9 +263,7 @@ extern const char kSbDisableExtensionBlacklist[]; extern const char kServiceProcess[]; extern const char kSilentDebuggerExtensionAPI[]; extern const char kSilentLaunch[]; -extern const char kSetToken[]; extern const char kShowAppList[]; -extern const char kShowIcons[]; extern const char kShowSavedCopy[]; extern const char kEnableShowSavedCopyPrimary[]; extern const char kEnableShowSavedCopySecondary[]; @@ -317,7 +304,6 @@ extern const char kSyncDisableRollback[]; extern const char kTestName[]; extern const char kTrustedSpdyProxy[]; extern const char kTryChromeAgain[]; -extern const char kUninstall[]; extern const char kUnlimitedStorage[]; extern const char kUnsafetyTreatInsecureOriginAsSecure[]; extern const char kUseSimpleCacheBackend[]; @@ -341,16 +327,20 @@ extern const char kDisableZeroSuggest[]; extern const char kEnableAccessibilityTabSwitcher[]; extern const char kEnableContextualSearch[]; extern const char kEnableDomDistillerButtonAnimation[]; +extern const char kEnableInstantSearchClicks[]; +extern const char kEnableReaderModeToolbarIcon[]; extern const char kEnableZeroSuggestMostVisited[]; extern const char kEnableZeroSuggestMostVisitedWithoutSerp[]; -extern const char kEnableInstantSearchClicks[]; -#endif +extern const char kPrefetchSearchResults[]; +#endif // defined(OS_ANDROID) #if defined(USE_ASH) extern const char kOpenAsh[]; #endif #if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_CHROMEOS) +extern const char kHelp[]; +extern const char kHelpShort[]; extern const char kPasswordStore[]; #endif @@ -363,19 +353,28 @@ extern const char kAppsKeepChromeAliveInTests[]; extern const char kHostedAppQuitNotification[]; extern const char kDisableHostedAppShimCreation[]; extern const char kDisableSystemFullscreenForTesting[]; -extern const char kRelauncherProcess[]; +extern const char kEnableTranslateNewUX[]; extern const char kMetricsClientID[]; -#endif +extern const char kRelauncherProcess[]; +#endif // defined(OS_MACOSX) #if defined(OS_WIN) extern const char kEnableCloudPrintXps[]; extern const char kEnableProfileShortcutManager[]; extern const char kForceDesktop[]; extern const char kForceImmersive[]; +extern const char kHideIcons[]; +extern const char kNoNetworkProfileWarning[]; extern const char kRelaunchShortcut[]; +extern const char kShowIcons[]; +extern const char kUninstall[]; extern const char kViewerLaunchViaAppId[]; extern const char kWaitForMutex[]; extern const char kWindows8Search[]; +#endif // defined(OS_WIN) + +#if defined(ENABLE_IPC_FUZZER) +extern const char kIpcFuzzerTestcase[]; #endif #if defined(ENABLE_PRINT_PREVIEW) && !defined(OFFICIAL_BUILD) diff --git a/chrome/common/env_vars.cc b/chrome/common/env_vars.cc index 5499dc3..f880adb 100644 --- a/chrome/common/env_vars.cc +++ b/chrome/common/env_vars.cc @@ -33,14 +33,4 @@ const char kRestartInfo[] = "CHROME_RESTART"; const char kRtlLocale[] = "RIGHT_TO_LEFT"; const char kLtrLocale[] = "LEFT_TO_RIGHT"; -// Number of times to run a given startup_tests unit test. -const char kStartupTestsNumCycles[] = "STARTUP_TESTS_NUMCYCLES"; - -// The presence of this environment variable with a value of 1 implies that -// setup.exe should run as a system installation regardless of what is on the -// command line. -// TODO(erikwright): Put this in chrome/installer/util/util_constants.cc when -// http://crbug.com/174953 is fixed and widely deployed. -const char kGoogleUpdateIsMachineEnvVar[] = "GoogleUpdateIsMachine"; - } // namespace env_vars diff --git a/chrome/common/env_vars.h b/chrome/common/env_vars.h index b1afa0b..8473356 100644 --- a/chrome/common/env_vars.h +++ b/chrome/common/env_vars.h @@ -17,12 +17,6 @@ extern const char kShowRestart[]; extern const char kRestartInfo[]; extern const char kRtlLocale[]; extern const char kLtrLocale[]; -extern const char kStartupTestsNumCycles[]; - -// Google Update named environment variable that implies kSystemLevel. -// TODO(erikwright): Put this in chrome/installer/util/util_constants.h when -// http://crbug.com/174953 is fixed and widely deployed. -extern const char kGoogleUpdateIsMachineEnvVar[]; } // namespace env_vars diff --git a/chrome/common/local_discovery/service_discovery_client_impl.h b/chrome/common/local_discovery/service_discovery_client_impl.h index 07949f1..777c3f7 100644 --- a/chrome/common/local_discovery/service_discovery_client_impl.h +++ b/chrome/common/local_discovery/service_discovery_client_impl.h @@ -208,8 +208,6 @@ class ServiceResolverImpl std::string service_name_; ResolveCompleteCallback callback_; - bool has_resolved_; - bool metadata_resolved_; bool address_resolved_; diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc index d9c092b..9ff1673 100644 --- a/chrome/common/pref_names.cc +++ b/chrome/common/pref_names.cc @@ -24,9 +24,6 @@ const char kChildAccountStatusKnown[] = "child_account_status_known"; // Defaults apps are installed only when creating a new profile. const char kDefaultApps[] = "default_apps"; -// Whether we have installed default apps yet in this profile. -const char kDefaultAppsInstalled[] = "default_apps_installed"; - // Disables screenshot accelerators and extension APIs. // This setting resides both in profile prefs and local state. Accelerator // handling code reads local state, while extension APIs use profile pref. @@ -228,12 +225,15 @@ const char kWebKitPictographFontFamilyMap[] = WEBKIT_WEBPREFS_FONTS_PICTOGRAPH; const char kWebKitStandardFontFamilyArabic[] = "webkit.webprefs.fonts.standard.Arab"; +#if defined(OS_WIN) const char kWebKitFixedFontFamilyArabic[] = "webkit.webprefs.fonts.fixed.Arab"; +#endif const char kWebKitSerifFontFamilyArabic[] = "webkit.webprefs.fonts.serif.Arab"; const char kWebKitSansSerifFontFamilyArabic[] = "webkit.webprefs.fonts.sansserif.Arab"; +#if defined(OS_WIN) const char kWebKitStandardFontFamilyCyrillic[] = "webkit.webprefs.fonts.standard.Cyrl"; const char kWebKitFixedFontFamilyCyrillic[] = @@ -250,6 +250,7 @@ const char kWebKitSerifFontFamilyGreek[] = "webkit.webprefs.fonts.serif.Grek"; const char kWebKitSansSerifFontFamilyGreek[] = "webkit.webprefs.fonts.sansserif.Grek"; +#endif const char kWebKitStandardFontFamilyJapanese[] = "webkit.webprefs.fonts.standard.Jpan"; const char kWebKitFixedFontFamilyJapanese[] = @@ -266,8 +267,10 @@ const char kWebKitSerifFontFamilyKorean[] = "webkit.webprefs.fonts.serif.Hang"; const char kWebKitSansSerifFontFamilyKorean[] = "webkit.webprefs.fonts.sansserif.Hang"; +#if defined(OS_WIN) const char kWebKitCursiveFontFamilyKorean[] = "webkit.webprefs.fonts.cursive.Hang"; +#endif const char kWebKitStandardFontFamilySimplifiedHan[] = "webkit.webprefs.fonts.standard.Hans"; const char kWebKitFixedFontFamilySimplifiedHan[] = @@ -369,9 +372,11 @@ const char kSearchSuggestEnabled[] = "search.suggest_enabled"; const char kContextualSearchEnabled[] = "search.contextual_search_enabled"; #endif +#if defined(OS_MACOSX) // Boolean that indicates whether the browser should put up a confirmation // window when the user is attempting to quit. Mac only. const char kConfirmToQuitEnabled[] = "browser.confirm_to_quit"; +#endif // Boolean which specifies whether we should ask the user if we should download // a file (true) or just download it automatically. @@ -397,15 +402,6 @@ const char kDisableSpdy[] = "spdy.disabled"; // Prefs for persisting HttpServerProperties. const char kHttpServerProperties[] = "net.http_server_properties"; -// Prefs for server names that support SPDY protocol. -const char kSpdyServers[] = "spdy.servers"; - -// Prefs for servers that support Alternate-Protocol. -const char kAlternateProtocolServers[] = "spdy.alternate_protocol"; - -// Disables the listed protocol schemes. -const char kDisabledSchemes[] = "protocol.disabled_schemes"; - #if defined(OS_ANDROID) || defined(OS_IOS) // Last time that a check for cloud policy management was done. This time is // recorded on Android so that retries aren't attempted on every startup. @@ -496,16 +492,6 @@ const char kLanguageCurrentInputMethod[] = const char kLanguagePreviousInputMethod[] = "settings.language.previous_input_method"; -// A string pref (comma-separated list) set to the "next engine in menu" -// hot-key lists. -const char kLanguageHotkeyNextEngineInMenu[] = - "settings.language.hotkey_next_engine_in_menu"; - -// A string pref (comma-separated list) set to the "previous engine" -// hot-key lists. -const char kLanguageHotkeyPreviousEngine[] = - "settings.language.hotkey_previous_engine"; - // A string pref (comma-separated list) set to the preferred language IDs // (ex. "en-US,fr,ko"). const char kLanguagePreferredLanguages[] = @@ -831,9 +817,6 @@ const char kCaptivePortalAuthenticationIgnoresProxy[] = const char kForceMaximizeOnFirstRun[] = "ui.force_maximize_on_first_run"; #endif // defined(OS_CHROMEOS) -// The disabled messages in IPC logging. -const char kIpcDisabledMessages[] = "ipc_log_disabled_messages"; - // A boolean pref set to true if a Home button to open the Home pages should be // visible on the toolbar. const char kShowHomeButton[] = "browser.show_home_button"; @@ -870,11 +853,6 @@ const char kEnableAutoSpellCorrect[] = "browser.enable_autospellcorrect"; const char kSpeechRecognitionFilterProfanities[] = "browser.speechinput_censor_results"; -// List of speech recognition context names (extensions or websites) for which -// the tray notification balloon has already been shown. -const char kSpeechRecognitionTrayNotificationShownContexts[] = - "browser.speechinput_tray_notification_shown_contexts"; - // Boolean controlling whether history saving is disabled. const char kSavingBrowserHistoryDisabled[] = "history.saving_disabled"; @@ -1043,9 +1021,11 @@ const char kAutofillDialogWalletShippingSameAsBilling[] = const char kAutofillGeneratedCardBubbleTimesShown[] = "autofill.generated_card_bubble_times_shown"; +#if defined(OS_ANDROID) // A dictionary that tracks the defaults to be set on the next invocation // of the requestAutocomplete dialog. const char kAutofillDialogDefaults[] = "autofill.rac_dialog_defaults"; +#endif #if !defined(OS_ANDROID) const char kPinnedTabs[] = "pinned_tabs"; @@ -1221,9 +1201,6 @@ const char kEasyUnlockPairing[] = "easy_unlock.pairing"; // in order to use Easy Unlock. const char kEasyUnlockProximityRequired[] = "easy_unlock.proximity_required"; -// Whether to show the Easy Unlock first run tutorial. -const char kEasyUnlockShowTutorial[] = "easy_unlock.show_tutorial"; - // A cache of zero suggest results using JSON serialized into a string. const char kZeroSuggestCachedResults[] = "zerosuggest.cachedresults"; @@ -1297,10 +1274,6 @@ const char kSSLVersionFallbackMin[] = "ssl.version_fallback_min"; const char kCipherSuiteBlacklist[] = "ssl.cipher_suites.blacklist"; const char kDisableSSLRecordSplitting[] = "ssl.ssl_record_splitting.disabled"; -// Dictionary of dates when a site's SSL blocking interstitial was proceeded -// through. -const char kSSLBlockingBypassed[] = "ssl.ssl_blocking_bypassed"; - // Boolean that specifies whether or not crash reporting and metrics reporting // are sent over the network for analysis. const char kMetricsReportingEnabled[] = @@ -1497,19 +1470,10 @@ const char kSpellCheckUseSpellingService[] = "spellcheck.use_spelling_service"; // The value is true if the scheme must be ignored. const char kExcludedSchemes[] = "protocol_handler.excluded_schemes"; -// Keys used for MAC handling of SafeBrowsing requests. -const char kSafeBrowsingClientKey[] = "safe_browsing.client_key"; -const char kSafeBrowsingWrappedKey[] = "safe_browsing.wrapped_key"; - // Integer that specifies the index of the tab the user was on when they // last visited the options window. const char kOptionsWindowLastTabIndex[] = "options_window.last_tab_index"; -// Integer that specifies the index of the tab the user was on when they -// last visited the Certificate Manager window. -const char kCertificateManagerWindowLastTabIndex[] = - "certificate_manager_window.last_tab_index"; - // Integer that specifies if the first run bubble should be shown. // This preference is only registered by the first-run procedure. const char kShowFirstRunBubbleOption[] = "show-first-run-bubble-option"; @@ -1539,10 +1503,6 @@ const char kWasRestarted[] = "was.restarted"; const char kRelaunchMode[] = "relaunch.mode"; #endif -// Placeholder preference for disabling voice / video chat if it is ever added. -// Currently, this does not change any behavior. -const char kDisableVideoAndChat[] = "disable_video_chat"; - // Whether Extensions are enabled. const char kDisableExtensions[] = "extensions.disabled"; @@ -1552,12 +1512,15 @@ const char kDisablePluginFinder[] = "plugins.disable_plugin_finder"; // Customized app page names that appear on the New Tab Page. const char kNtpAppPageNames[] = "ntp.app_page_names"; +#if defined(OS_ANDROID) // Keeps track of currently open tabs collapsed state in the Other Devices menu. const char kNtpCollapsedCurrentlyOpenTabs[] = "ntp.collapsed_open_tabs"; +#endif // Keeps track of which sessions are collapsed in the Other Devices menu. const char kNtpCollapsedForeignSessions[] = "ntp.collapsed_foreign_sessions"; +#if defined(OS_ANDROID) // Keeps track of recently closed tabs collapsed state in the Other Devices // menu. const char kNtpCollapsedRecentlyClosedTabs[] = @@ -1568,28 +1531,14 @@ const char kNtpCollapsedSnapshotDocument[] = "ntp.collapsed_snapshot_document"; // Keeps track of sync promo collapsed state in the Other Devices menu. const char kNtpCollapsedSyncPromo[] = "ntp.collapsed_sync_promo"; - -// Serves dates to determine display of elements on the NTP. -const char kNtpDateResourceServer[] = "ntp.date_resource_server"; +#endif // New Tab Page URLs that should not be shown as most visited thumbnails. const char kNtpMostVisitedURLsBlacklist[] = "ntp.most_visited_blacklist"; -// True if a desktop sync session was found for this user. -const char kNtpPromoDesktopSessionFound[] = "ntp.promo_desktop_session_found"; - -// Which bookmarks folder should be visible on the new tab page v4. -const char kNtpShownBookmarksFolder[] = "ntp.shown_bookmarks_folder"; - // Which page should be visible on the new tab page v4 const char kNtpShownPage[] = "ntp.shown_page"; -// Serves tips for the NTP. -const char kNtpTipsResourceServer[] = "ntp.tips_resource_server"; - -// Boolean indicating whether the web store is active for the current locale. -const char kNtpWebStoreEnabled[] = "ntp.webstore_enabled"; - // A private RSA key for ADB handshake. const char kDevToolsAdbKey[] = "devtools.adb_key"; @@ -1606,9 +1555,6 @@ const char kDevToolsEditedFiles[] = "devtools.edited_files"; // List of file system paths added in DevTools. const char kDevToolsFileSystemPaths[] = "devtools.file_system_paths"; -// A boolean specifying whether dev tools window should be opened docked. -const char kDevToolsOpenDocked[] = "devtools.open_docked"; - // A boolean specifying whether port forwarding should be enabled. const char kDevToolsPortForwardingEnabled[] = "devtools.port_forwarding_enabled"; @@ -1697,16 +1643,12 @@ const char kPrintPreviewStickySettings[] = // The last requested size of the dialog as it was closed. const char kCloudPrintDialogWidth[] = "cloud_print.dialog_size.width"; const char kCloudPrintDialogHeight[] = "cloud_print.dialog_size.height"; -const char kCloudPrintSigninDialogWidth[] = - "cloud_print.signin_dialog_size.width"; -const char kCloudPrintSigninDialogHeight[] = - "cloud_print.signin_dialog_size.height"; // The list of BackgroundContents that should be loaded when the browser // launches. const char kRegisteredBackgroundContents[] = "background_contents.registered"; -#if !defined(OS_ANDROID) +#if defined(OS_WIN) // An int that stores how often we've shown the "Chrome is configured to // auto-launch" infobar. const char kShownAutoLaunchInfobar[] = "browser.shown_autolaunch_infobar"; @@ -1993,9 +1935,6 @@ const char kCloudPrintProxyEnabled[] = "cloud_print.enabled"; const char kCloudPrintProxyId[] = "cloud_print.proxy_id"; // The GAIA auth token for Cloud Print const char kCloudPrintAuthToken[] = "cloud_print.auth_token"; -// The GAIA auth token used by Cloud Print to authenticate with the XMPP server -// This should eventually go away because the above token should work for both. -const char kCloudPrintXMPPAuthToken[] = "cloud_print.xmpp_auth_token"; // The email address of the account used to authenticate with the Cloud Print // server. const char kCloudPrintEmail[] = "cloud_print.email"; @@ -2163,6 +2102,7 @@ const char kOverscrollVerticalResistThreshold[] = "overscroll.vertical_resist_threshold"; #endif +#if defined(OS_WIN) // Counts how many more times the 'profile on a network share' warning should be // shown to the user before the next silence period. const char kNetworkProfileWarningsLeft[] = "network_profile.warnings_left"; @@ -2170,6 +2110,7 @@ const char kNetworkProfileWarningsLeft[] = "network_profile.warnings_left"; // |network_profile.warnings_left| after a silence period. const char kNetworkProfileLastWarningTime[] = "network_profile.last_warning_time"; +#endif #if defined(OS_CHROMEOS) // The RLZ brand code, if enabled. @@ -2207,9 +2148,11 @@ const char kAppListEnableTime[] = "app_list.when_enabled"; // The last time the app list was launched. const char kAppListLastLaunchTime[] = "app_list.last_launch"; +#if defined(OS_MACOSX) // Integer representing the version of the app launcher shortcut installed on // the system. Incremented, e.g., when embedded icons change. const char kAppLauncherShortcutVersion[] = "apps.app_launcher.shortcut_version"; +#endif // A boolean identifying if we should show the app launcher promo or not. const char kShowAppLauncherPromo[] = "app_launcher.show_promo"; @@ -2223,8 +2166,9 @@ const char kAppLauncherDriveAppMapping[] = // A list of Drive app ids that tracks the uninstallable Drive apps. const char kAppLauncherUninstalledDriveApps[] = "apps.app_launcher.uninstalled_drive_apps"; -#endif +#endif // defined(ENABLE_APP_LIST) +#if defined(OS_WIN) // If set, the user requested to launch the app with this extension id while // in Metro mode, and then relaunched to Desktop mode to start it. const char kAppLaunchForMetroRestart[] = "apps.app_launch_for_metro_restart"; @@ -2233,6 +2177,7 @@ const char kAppLaunchForMetroRestart[] = "apps.app_launch_for_metro_restart"; // launch of the specified app when restarting Chrome in desktop mode. const char kAppLaunchForMetroRestartProfile[] = "apps.app_launch_for_metro_restart_profile"; +#endif // An integer that is incremented whenever changes are made to app shortcuts. // Increasing this causes all app shortcuts to be recreated. diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h index 7e64f5c..c034734 100644 --- a/chrome/common/pref_names.h +++ b/chrome/common/pref_names.h @@ -24,7 +24,6 @@ namespace prefs { // Profile prefs. Please add Local State prefs below instead. extern const char kChildAccountStatusKnown[]; extern const char kDefaultApps[]; -extern const char kDefaultAppsInstalled[]; extern const char kDisableScreenshots[]; extern const char kForceEphemeralProfiles[]; extern const char kHomePageIsNewTabPage[]; @@ -89,9 +88,12 @@ extern const char kWebKitPictographFontFamilyMap[]; // Per-script font prefs that have defaults, for easy reference when registering // the defaults. extern const char kWebKitStandardFontFamilyArabic[]; +#if defined(OS_WIN) extern const char kWebKitFixedFontFamilyArabic[]; +#endif extern const char kWebKitSerifFontFamilyArabic[]; extern const char kWebKitSansSerifFontFamilyArabic[]; +#if defined(OS_WIN) extern const char kWebKitStandardFontFamilyCyrillic[]; extern const char kWebKitFixedFontFamilyCyrillic[]; extern const char kWebKitSerifFontFamilyCyrillic[]; @@ -100,6 +102,7 @@ extern const char kWebKitStandardFontFamilyGreek[]; extern const char kWebKitFixedFontFamilyGreek[]; extern const char kWebKitSerifFontFamilyGreek[]; extern const char kWebKitSansSerifFontFamilyGreek[]; +#endif extern const char kWebKitStandardFontFamilyJapanese[]; extern const char kWebKitFixedFontFamilyJapanese[]; extern const char kWebKitSerifFontFamilyJapanese[]; @@ -108,7 +111,9 @@ extern const char kWebKitStandardFontFamilyKorean[]; extern const char kWebKitFixedFontFamilyKorean[]; extern const char kWebKitSerifFontFamilyKorean[]; extern const char kWebKitSansSerifFontFamilyKorean[]; +#if defined(OS_WIN) extern const char kWebKitCursiveFontFamilyKorean[]; +#endif extern const char kWebKitStandardFontFamilySimplifiedHan[]; extern const char kWebKitFixedFontFamilySimplifiedHan[]; extern const char kWebKitSerifFontFamilySimplifiedHan[]; @@ -150,16 +155,15 @@ extern const char kSearchSuggestEnabled[]; #if defined(OS_ANDROID) extern const char kContextualSearchEnabled[]; #endif +#if defined(OS_MACOSX) extern const char kConfirmToQuitEnabled[]; +#endif extern const char kPromptForDownload[]; extern const char kAlternateErrorPagesEnabled[]; extern const char kDnsPrefetchingStartupList[]; extern const char kDnsPrefetchingHostReferralList[]; extern const char kDisableSpdy[]; extern const char kHttpServerProperties[]; -extern const char kSpdyServers[]; -extern const char kAlternateProtocolServers[]; -extern const char kDisabledSchemes[]; #if defined(OS_ANDROID) || defined(OS_IOS) extern const char kLastPolicyCheckTime[]; #endif @@ -186,8 +190,6 @@ extern const char kDisableDriveHostedFiles[]; // keyboards, not UI languages. extern const char kLanguageCurrentInputMethod[]; extern const char kLanguagePreviousInputMethod[]; -extern const char kLanguageHotkeyNextEngineInMenu[]; -extern const char kLanguageHotkeyPreviousEngine[]; extern const char kLanguagePreferredLanguages[]; extern const char kLanguagePreferredLanguagesSyncable[]; extern const char kLanguagePreloadEngines[]; @@ -273,7 +275,6 @@ extern const char kWakeOnWifiSsid[]; extern const char kCaptivePortalAuthenticationIgnoresProxy[]; extern const char kForceMaximizeOnFirstRun[]; #endif // defined(OS_CHROMEOS) -extern const char kIpcDisabledMessages[]; extern const char kShowHomeButton[]; extern const char kRecentlySelectedEncoding[]; extern const char kDeleteBrowsingHistory[]; @@ -286,7 +287,6 @@ extern const char kDeleteHostedAppsData[]; extern const char kDeauthorizeContentLicenses[]; extern const char kEnableContinuousSpellcheck[]; extern const char kSpeechRecognitionFilterProfanities[]; -extern const char kSpeechRecognitionTrayNotificationShownContexts[]; extern const char kEnabledLabsExperiments[]; extern const char kEnableAutoSpellCorrect[]; extern const char kSavingBrowserHistoryDisabled[]; @@ -346,7 +346,9 @@ extern const char kAutofillDialogWalletLocationAcceptance[]; extern const char kAutofillDialogSaveData[]; extern const char kAutofillDialogWalletShippingSameAsBilling[]; extern const char kAutofillGeneratedCardBubbleTimesShown[]; +#if defined(OS_ANDROID) extern const char kAutofillDialogDefaults[]; +#endif #if !defined(OS_ANDROID) extern const char kPinnedTabs[]; @@ -409,7 +411,6 @@ extern const char kEasyUnlockAllowed[]; extern const char kEasyUnlockEnabled[]; extern const char kEasyUnlockPairing[]; extern const char kEasyUnlockProximityRequired[]; -extern const char kEasyUnlockShowTutorial[]; extern const char kZeroSuggestCachedResults[]; @@ -433,8 +434,6 @@ extern const char kSSLVersionFallbackMin[]; extern const char kCipherSuiteBlacklist[]; extern const char kDisableSSLRecordSplitting[]; -extern const char kSSLBlockingBypassed[]; - extern const char kGLVendorString[]; extern const char kGLRendererString[]; extern const char kGLVersionString[]; @@ -523,11 +522,7 @@ extern const char kSpellCheckUseSpellingService[]; extern const char kExcludedSchemes[]; -extern const char kSafeBrowsingClientKey[]; -extern const char kSafeBrowsingWrappedKey[]; - extern const char kOptionsWindowLastTabIndex[]; -extern const char kCertificateManagerWindowLastTabIndex[]; extern const char kShowFirstRunBubbleOption[]; extern const char kLastKnownIntranetRedirectOrigin[]; @@ -542,31 +537,27 @@ extern const char kWasRestarted[]; extern const char kRelaunchMode[]; #endif -extern const char kDisableVideoAndChat[]; - extern const char kDisableExtensions[]; extern const char kDisablePluginFinder[]; extern const char kNtpAppPageNames[]; +#if defined(OS_ANDROID) extern const char kNtpCollapsedCurrentlyOpenTabs[]; +#endif extern const char kNtpCollapsedForeignSessions[]; +#if defined(OS_ANDROID) extern const char kNtpCollapsedRecentlyClosedTabs[]; extern const char kNtpCollapsedSnapshotDocument[]; extern const char kNtpCollapsedSyncPromo[]; -extern const char kNtpDateResourceServer[]; +#endif extern const char kNtpMostVisitedURLsBlacklist[]; -extern const char kNtpPromoDesktopSessionFound[]; -extern const char kNtpShownBookmarksFolder[]; extern const char kNtpShownPage[]; -extern const char kNtpTipsResourceServer[]; -extern const char kNtpWebStoreEnabled[]; extern const char kDevToolsAdbKey[]; extern const char kDevToolsDisabled[]; extern const char kDevToolsDiscoverUsbDevicesEnabled[]; extern const char kDevToolsEditedFiles[]; extern const char kDevToolsFileSystemPaths[]; -extern const char kDevToolsOpenDocked[]; extern const char kDevToolsPortForwardingEnabled[]; extern const char kDevToolsPortForwardingDefaultSet[]; extern const char kDevToolsPortForwardingConfig[]; @@ -608,12 +599,9 @@ extern const char kPrintPreviewStickySettings[]; extern const char kCloudPrintRoot[]; extern const char kCloudPrintDialogWidth[]; extern const char kCloudPrintDialogHeight[]; -extern const char kCloudPrintSigninDialogWidth[]; -extern const char kCloudPrintSigninDialogHeight[]; extern const char kCloudPrintProxyEnabled[]; extern const char kCloudPrintProxyId[]; extern const char kCloudPrintAuthToken[]; -extern const char kCloudPrintXMPPAuthToken[]; extern const char kCloudPrintEmail[]; extern const char kCloudPrintPrintSystemSettings[]; extern const char kCloudPrintEnableJobPoll[]; @@ -676,7 +664,6 @@ extern const char kCustomizationDefaultWallpaperURL[]; extern const char kLogoutStartedLast[]; extern const char kConsumerManagementStage[]; extern const char kNewOobe[]; -extern const char kConsumerManagementEnrollmentStage[]; extern const char kWebviewSigninDisabled[]; extern const char kNewLoginUIPopup[]; #endif // defined(OS_CHROMEOS) @@ -695,7 +682,7 @@ extern const char kTabStripStackedLayout[]; extern const char kRegisteredBackgroundContents[]; -#if !defined(OS_ANDROID) +#if defined(OS_WIN) extern const char kShownAutoLaunchInfobar[]; #endif @@ -773,8 +760,10 @@ extern const char kOverscrollHorizontalResistThreshold[]; extern const char kOverscrollVerticalResistThreshold[]; #endif +#if defined(OS_WIN) extern const char kNetworkProfileWarningsLeft[]; extern const char kNetworkProfileLastWarningTime[]; +#endif #if defined(OS_CHROMEOS) extern const char kRLZBrand[]; @@ -791,14 +780,18 @@ extern const char kAppLauncherHasBeenEnabled[]; extern const char kAppListEnableMethod[]; extern const char kAppListEnableTime[]; extern const char kAppListLastLaunchTime[]; +#if defined(OS_MACOSX) extern const char kAppLauncherShortcutVersion[]; +#endif extern const char kShowAppLauncherPromo[]; extern const char kAppLauncherDriveAppMapping[]; extern const char kAppLauncherUninstalledDriveApps[]; -#endif +#endif // defined(ENABLE_APP_LIST) +#if defined(OS_WIN) extern const char kAppLaunchForMetroRestart[]; extern const char kAppLaunchForMetroRestartProfile[]; +#endif extern const char kAppShortcutsVersion[]; extern const char kModuleConflictBubbleShown[]; diff --git a/chrome/common/tts_utterance_request.cc b/chrome/common/tts_utterance_request.cc index 86fb0db..23b5dce 100644 --- a/chrome/common/tts_utterance_request.cc +++ b/chrome/common/tts_utterance_request.cc @@ -21,10 +21,3 @@ TtsVoice::TtsVoice() TtsVoice::~TtsVoice() { } - -TtsUtteranceResponse::TtsUtteranceResponse() - : id(0) { -} - -TtsUtteranceResponse::~TtsUtteranceResponse() { -} diff --git a/chrome/common/tts_utterance_request.h b/chrome/common/tts_utterance_request.h index e652b5a..e3dcf18 100644 --- a/chrome/common/tts_utterance_request.h +++ b/chrome/common/tts_utterance_request.h @@ -34,11 +34,4 @@ struct TtsVoice { bool is_default; }; -struct TtsUtteranceResponse { - TtsUtteranceResponse(); - ~TtsUtteranceResponse(); - - int id; -}; - #endif // CHROME_COMMON_TTS_UTTERANCE_REQUEST_H_ diff --git a/chrome/common/url_constants.cc b/chrome/common/url_constants.cc index 0ac097f..72c4d66 100644 --- a/chrome/common/url_constants.cc +++ b/chrome/common/url_constants.cc @@ -31,8 +31,6 @@ const char kChromeUICloudPrintResourcesURL[] = "chrome://cloudprintresources/"; const char kChromeUIComponentsURL[] = "chrome://components/"; const char kChromeUIConflictsURL[] = "chrome://conflicts/"; const char kChromeUIConstrainedHTMLTestURL[] = "chrome://constrained-test/"; -const char kChromeUIContextualSearchPromoURL[] = - "chrome://contextual-search-promo"; const char kChromeUICrashesURL[] = "chrome://crashes/"; const char kChromeUICreditsURL[] = "chrome://credits/"; const char kChromeUIDevicesURL[] = "chrome://devices/"; @@ -41,13 +39,11 @@ const char kChromeUIDevToolsURL[] = const char kChromeUIDomainReliabilityInternalsURL[] = "chrome://domain-reliability-internals/"; const char kChromeUIDownloadsURL[] = "chrome://downloads/"; -const char kChromeUIEditSearchEngineDialogURL[] = "chrome://editsearchengine/"; const char kChromeUIExtensionIconURL[] = "chrome://extension-icon/"; const char kChromeUIExtensionsFrameURL[] = "chrome://extensions-frame/"; const char kChromeUIExtensionsURL[] = "chrome://extensions/"; const char kChromeUIFallbackIconURL[] = "chrome://fallback-icon/"; const char kChromeUIFaviconURL[] = "chrome://favicon/"; -const char kChromeUIFeedbackURL[] = "chrome://feedback/"; const char kChromeUIFlagsURL[] = "chrome://flags/"; const char kChromeUIFlashURL[] = "chrome://flash/"; const char kChromeUIGCMInternalsURL[] = "chrome://gcm-internals/"; @@ -63,10 +59,9 @@ const char kChromeUILargeIconURL[] = "chrome://large-icon/"; const char kChromeUIMdSettingsURL[] = "chrome://md-settings/"; const char kChromeUIMemoryRedirectURL[] = "chrome://memory-redirect/"; const char kChromeUIMemoryURL[] = "chrome://memory/"; -const char kChromeUIMetroFlowURL[] = "chrome://make-metro/"; const char kChromeUINaClURL[] = "chrome://nacl/"; const char kChromeUINetInternalsURL[] = "chrome://net-internals/"; -const char kChromeUINewProfile[] = "chrome://newprofile/"; +const char kChromeUINewProfileURL[] = "chrome://newprofile/"; const char kChromeUINewTabURL[] = "chrome://newtab/"; const char kChromeUIOmniboxURL[] = "chrome://omnibox/"; const char kChromeUIPluginsURL[] = "chrome://plugins/"; @@ -80,8 +75,7 @@ const char kChromeUIRestartURL[] = "chrome://restart/"; const char kChromeUISettingsURL[] = "chrome://settings/"; const char kChromeUIContentSettingsURL[] = "chrome://settings/content"; const char kChromeUISettingsFrameURL[] = "chrome://settings-frame/"; -const char kChromeUISSLClientCertificateSelectorURL[] = "chrome://select-cert/"; -const char kChromeUISuggestions[] = "chrome://suggestions/"; +const char kChromeUISuggestionsURL[] = "chrome://suggestions/"; const char kChromeUISuggestionsInternalsURL[] = "chrome://suggestions-internals/"; const char kChromeUISupervisedUserPassphrasePageURL[] = @@ -97,6 +91,8 @@ const char kChromeUIVersionURL[] = "chrome://version/"; const char kChromeUIVoiceSearchURL[] = "chrome://voicesearch/"; #if defined(OS_ANDROID) +const char kChromeUIContextualSearchPromoURL[] = + "chrome://contextual-search-promo"; const char kChromeUINativeScheme[] = "chrome-native"; const char kChromeUINativeNewTabURL[] = "chrome-native://newtab/"; const char kChromeUINativeBookmarksURL[] = "chrome-native://bookmarks/"; @@ -104,7 +100,6 @@ const char kChromeUINativeRecentTabsURL[] = "chrome-native://recent-tabs/"; #endif #if defined(OS_CHROMEOS) -const char kChromeUIActivationMessage[] = "chrome://activationmessage/"; const char kChromeUIBluetoothPairingURL[] = "chrome://bluetooth-pairing/"; const char kChromeUICertificateManagerDialogURL[] = "chrome://certificate-manager/"; @@ -112,31 +107,30 @@ const char kChromeUIChooseMobileNetworkURL[] = "chrome://choose-mobile-network/"; const char kChromeUIDiscardsURL[] = "chrome://discards/"; const char kChromeUIFirstRunURL[] = "chrome://first-run/"; -const char kChromeUIIdleLogoutDialogURL[] = "chrome://idle-logout/"; const char kChromeUIImageBurnerURL[] = "chrome://imageburner/"; const char kChromeUIKeyboardOverlayURL[] = "chrome://keyboardoverlay/"; -const char kChromeUILockScreenURL[] = "chrome://lock/"; -const char kChromeUIMediaplayerURL[] = "chrome://mediaplayer/"; const char kChromeUIMobileSetupURL[] = "chrome://mobilesetup/"; const char kChromeUINfcDebugURL[] = "chrome://nfc-debug/"; const char kChromeUIOobeURL[] = "chrome://oobe/"; const char kChromeUIOSCreditsURL[] = "chrome://os-credits/"; const char kChromeUIProxySettingsURL[] = "chrome://proxy-settings/"; +const char kChromeUISalsaURL[] = "chrome://salsa/"; const char kChromeUIScreenlockIconURL[] = "chrome://screenlock-icon/"; const char kChromeUISetTimeURL[] = "chrome://set-time/"; const char kChromeUISimUnlockURL[] = "chrome://sim-unlock/"; -const char kChromeUISlideshowURL[] = "chrome://slideshow/"; const char kChromeUISlowURL[] = "chrome://slow/"; const char kChromeUISystemInfoURL[] = "chrome://system/"; const char kChromeUITermsOemURL[] = "chrome://terms/oem"; const char kChromeUIUserImageURL[] = "chrome://userimage/"; +#endif // defined(OS_CHROMEOS) + +#if defined(OS_WIN) +const char kChromeUIMetroFlowURL[] = "chrome://make-metro/"; #endif #if defined(USE_AURA) const char kChromeUIGestureConfigURL[] = "chrome://gesture/"; const char kChromeUIGestureConfigHost[] = "gesture"; -const char kChromeUISalsaURL[] = "chrome://salsa/"; -const char kChromeUISalsaHost[] = "salsa"; #endif #if (defined(OS_LINUX) && defined(TOOLKIT_VIEWS)) || defined(USE_AURA) @@ -173,7 +167,6 @@ const char kChromeUICloudPrintResourcesHost[] = "cloudprintresources"; const char kChromeUICloudPrintSetupHost[] = "cloudprintsetup"; const char kChromeUIConflictsHost[] = "conflicts"; const char kChromeUIConstrainedHTMLTestHost[] = "constrained-test"; -const char kChromeUIContextualSearchPromoHost[] = "contextual-search-promo"; const char kChromeUICrashesHost[] = "crashes"; const char kChromeUICrashHost[] = "crash"; const char kChromeUICreditsHost[] = "credits"; @@ -188,13 +181,11 @@ const char kChromeUIDomainReliabilityInternalsHost[] = "domain-reliability-internals"; const char kChromeUIDownloadsHost[] = "downloads"; const char kChromeUIDriveInternalsHost[] = "drive-internals"; -const char kChromeUIEditSearchEngineDialogHost[] = "editsearchengine"; const char kChromeUIExtensionIconHost[] = "extension-icon"; const char kChromeUIExtensionsFrameHost[] = "extensions-frame"; const char kChromeUIExtensionsHost[] = "extensions"; const char kChromeUIFallbackIconHost[] = "fallback-icon"; const char kChromeUIFaviconHost[] = "favicon"; -const char kChromeUIFeedbackHost[] = "feedback"; const char kChromeUIFlagsHost[] = "flags"; const char kChromeUIFlashHost[] = "flash"; const char kChromeUIGCMInternalsHost[] = "gcm-internals"; @@ -215,7 +206,6 @@ const char kChromeUIMdSettingsHost[] = "md-settings"; const char kChromeUIMemoryHost[] = "memory"; const char kChromeUIMemoryInternalsHost[] = "memory-internals"; const char kChromeUIMemoryRedirectHost[] = "memory-redirect"; -const char kChromeUIMetroFlowHost[] = "make-metro"; const char kChromeUINaClHost[] = "nacl"; const char kChromeUINetExportHost[] = "net-export"; const char kChromeUINetInternalsHost[] = "net-internals"; @@ -238,7 +228,6 @@ const char kChromeUISettingsHost[] = "settings"; const char kChromeUISettingsFrameHost[] = "settings-frame"; const char kChromeUIShorthangHost[] = "shorthang"; const char kChromeUISignInInternalsHost[] = "signin-internals"; -const char kChromeUISSLClientCertificateSelectorHost[] = "select-cert"; const char kChromeUISuggestionsHost[] = "suggestions"; const char kChromeUISuggestionsInternalsHost[] = "suggestions-internals"; const char kChromeUISupervisedUserPassphrasePageHost[] = @@ -264,7 +253,6 @@ const char kChromeUIWebRTCDeviceProviderHost[] = "webrtc-device-provider"; const char kChromeUIWorkersHost[] = "workers"; -const char kChromeUIScreenshotPath[] = "screenshots"; const char kChromeUIThemePath[] = "theme"; #if defined(ENABLE_PRINT_PREVIEW) @@ -276,6 +264,10 @@ const char kChromeUILinuxProxyConfigHost[] = "linux-proxy-config"; const char kChromeUISandboxHost[] = "sandbox"; #endif +#if defined(OS_ANDROID) +const char kChromeUIContextualSearchPromoHost[] = "contextual-search-promo"; +#endif + #if defined(OS_CHROMEOS) const char kChromeUIActivationMessageHost[] = "activationmessage"; const char kChromeUIAppLaunchHost[] = "app-launch"; @@ -285,13 +277,10 @@ const char kChromeUIChooseMobileNetworkHost[] = "choose-mobile-network"; const char kChromeUICryptohomeHost[] = "cryptohome"; const char kChromeUIDiscardsHost[] = "discards"; const char kChromeUIFirstRunHost[] = "first-run"; -const char kChromeUIIdleLogoutDialogHost[] = "idle-logout"; const char kChromeUIImageBurnerHost[] = "imageburner"; const char kChromeUIKeyboardOverlayHost[] = "keyboardoverlay"; -const char kChromeUILockScreenHost[] = "lock"; const char kChromeUILoginContainerHost[] = "login-container"; const char kChromeUILoginHost[] = "login"; -const char kChromeUIMediaplayerHost[] = "mediaplayer"; const char kChromeUIMobileSetupHost[] = "mobilesetup"; const char kChromeUINfcDebugHost[] = "nfc-debug"; const char kChromeUINetworkHost[] = "network"; @@ -302,18 +291,14 @@ const char kChromeUIPowerHost[] = "power"; const char kChromeUIProvidedFileSystemsHost[] = "provided-file-systems"; const char kChromeUIProxySettingsHost[] = "proxy-settings"; const char kChromeUIRotateHost[] = "rotate"; +const char kChromeUISalsaHost[] = "salsa"; const char kChromeUIScreenlockIconHost[] = "screenlock-icon"; const char kChromeUISetTimeHost[] = "set-time"; const char kChromeUISimUnlockHost[] = "sim-unlock"; -const char kChromeUISlideshowHost[] = "slideshow"; const char kChromeUISlowHost[] = "slow"; const char kChromeUISlowTraceHost[] = "slow_trace"; const char kChromeUIUserImageHost[] = "userimage"; -const char kChromeUIMenu[] = "menu"; -const char kChromeUINetworkMenu[] = "network-menu"; -const char kChromeUIWrenchMenu[] = "wrench-menu"; - const char kEULAPathFormat[] = "/usr/share/chromeos-assets/eula/%s/eula.html"; const char kOemEulaURLPath[] = "oem"; const char kOnlineEulaURLPath[] = @@ -324,6 +309,10 @@ const char kChromeOSCreditsPath[] = const char kChromeOSAssetHost[] = "chromeos-asset"; const char kChromeOSAssetPath[] = "/usr/share/chromeos-assets/"; +#endif // defined(OS_CHROMEOS) + +#if defined(OS_WIN) +const char kChromeUIMetroFlowHost[] = "make-metro"; #endif #if (defined(OS_LINUX) && defined(TOOLKIT_VIEWS)) || defined(USE_AURA) @@ -360,11 +349,9 @@ const char kResetProfileSettingsSubPage[] = "resetProfileSettings"; const char kSearchEnginesSubPage[] = "searchEngines"; const char kSearchSubPage[] = "search"; const char kSearchUsersSubPage[] = "search#Users"; -const char kSupervisedUserSettingsSubPage[] = "managedUser"; const char kSyncSetupSubPage[] = "syncSetup"; #if defined(OS_CHROMEOS) const char kInternetOptionsSubPage[] = "internet"; -const char kBluetoothAddDeviceSubPage[] = "bluetooth"; const char kChangeProfilePictureSubPage[] = "changePicture"; #endif @@ -439,8 +426,10 @@ const char kChromeSyncMergeTroubleshootingURL[] = "https://support.google.com/chrome/answer/1181420#merge"; #endif // defined(ENABLE_ONE_CLICK_SIGNIN) +#if defined(OS_MACOSX) const char kChromeEnterpriseSignInLearnMoreURL[] = "http://support.google.com/chromeos/bin/answer.py?hl=en&answer=1331549"; +#endif const char kResetProfileSettingsLearnMoreURL[] = "https://support.google.com/chrome/?p=ui_reset_settings"; @@ -521,8 +510,10 @@ const char kChromiumProjectURL[] = "http://www.chromium.org/"; const char kLearnMoreReportingURL[] = "https://support.google.com/chrome/?p=ui_usagestat"; +#if defined(ENABLE_PLUGIN_INSTALLATION) const char kOutdatedPluginLearnMoreURL[] = "https://support.google.com/chrome/?p=ib_outdated_plugin"; +#endif const char kBlockedPluginLearnMoreURL[] = "https://support.google.com/chrome/?p=ib_blocked_plugin"; @@ -585,8 +576,10 @@ const char kRemoveNonCWSExtensionURL[] = "https://support.google.com/chrome/answer/2811969?" "p=ui_remove_non_cws_extensions&rd=1"; +#if defined(OS_WIN) const char kNotificationsHelpURL[] = "https://support.google.com/chrome/?p=ui_notifications"; +#endif const char kNotificationWelcomeLearnMoreURL[] = "https://support.google.com/chrome/?p=ib_google_now_welcome"; diff --git a/chrome/common/url_constants.h b/chrome/common/url_constants.h index 9162183..36163c2 100644 --- a/chrome/common/url_constants.h +++ b/chrome/common/url_constants.h @@ -29,20 +29,17 @@ extern const char kChromeUICloudPrintResourcesURL[]; extern const char kChromeUIComponentsURL[]; extern const char kChromeUIConflictsURL[]; extern const char kChromeUIConstrainedHTMLTestURL[]; -extern const char kChromeUIContextualSearchPromoURL[]; extern const char kChromeUICrashesURL[]; extern const char kChromeUICreditsURL[]; extern const char kChromeUIDevicesURL[]; extern const char kChromeUIDevToolsURL[]; extern const char kChromeUIDomainReliabilityInternalsURL[]; extern const char kChromeUIDownloadsURL[]; -extern const char kChromeUIEditSearchEngineDialogURL[]; extern const char kChromeUIExtensionIconURL[]; extern const char kChromeUIExtensionsFrameURL[]; extern const char kChromeUIExtensionsURL[]; extern const char kChromeUIFallbackIconURL[]; extern const char kChromeUIFaviconURL[]; -extern const char kChromeUIFeedbackURL[]; extern const char kChromeUIFlagsURL[]; extern const char kChromeUIFlashURL[]; extern const char kChromeUIGCMInternalsURL[]; @@ -57,10 +54,9 @@ extern const char kChromeUIInvalidationsURL[]; extern const char kChromeUILargeIconURL[]; extern const char kChromeUIMemoryRedirectURL[]; extern const char kChromeUIMemoryURL[]; -extern const char kChromeUIMetroFlowURL[]; extern const char kChromeUINaClURL[]; extern const char kChromeUINetInternalsURL[]; -extern const char kChromeUINewProfile[]; +extern const char kChromeUINewProfileURL[]; extern const char kChromeUINewTabURL[]; extern const char kChromeUIOmniboxURL[]; extern const char kChromeUIPasswordManagerInternalsHost[]; @@ -71,15 +67,13 @@ extern const char kChromeUIUserManagerURL[]; extern const char kChromeUIPrintURL[]; extern const char kChromeUIQuitURL[]; extern const char kChromeUIRestartURL[]; -extern const char kChromeUISessionFaviconURL[]; extern const char kChromeUIMdSettingsURL[]; extern const char kChromeUISettingsURL[]; extern const char kChromeUIContentSettingsURL[]; extern const char kChromeUISettingsFrameURL[]; -extern const char kChromeUISuggestions[]; +extern const char kChromeUISuggestionsURL[]; extern const char kChromeUISuggestionsInternalsURL[]; extern const char kChromeUISupervisedUserPassphrasePageURL[]; -extern const char kChromeUISSLClientCertificateSelectorURL[]; extern const char kChromeUITermsURL[]; extern const char kChromeUIThemeURL[]; extern const char kChromeUIThumbnailURL[]; @@ -91,6 +85,7 @@ extern const char kChromeUIVersionURL[]; extern const char kChromeUIVoiceSearchURL[]; #if defined(OS_ANDROID) +extern const char kChromeUIContextualSearchPromoURL[]; extern const char kChromeUINativeScheme[]; extern const char kChromeUINativeNewTabURL[]; extern const char kChromeUINativeBookmarksURL[]; @@ -98,38 +93,35 @@ extern const char kChromeUINativeRecentTabsURL[]; #endif #if defined(OS_CHROMEOS) -extern const char kChromeUIActivationMessage[]; extern const char kChromeUIBluetoothPairingURL[]; extern const char kChromeUICertificateManagerDialogURL[]; extern const char kChromeUIChooseMobileNetworkURL[]; -extern const char kChromeUIDiagnosticsURL[]; extern const char kChromeUIDiscardsURL[]; extern const char kChromeUIFirstRunURL[]; -extern const char kChromeUIIdleLogoutDialogURL[]; extern const char kChromeUIImageBurnerURL[]; extern const char kChromeUIKeyboardOverlayURL[]; -extern const char kChromeUILockScreenURL[]; -extern const char kChromeUIMediaplayerURL[]; extern const char kChromeUIMobileSetupURL[]; extern const char kChromeUINfcDebugURL[]; extern const char kChromeUIOobeURL[]; extern const char kChromeUIOSCreditsURL[]; extern const char kChromeUIProxySettingsURL[]; +extern const char kChromeUISalsaURL[]; extern const char kChromeUIScreenlockIconURL[]; extern const char kChromeUISetTimeURL[]; extern const char kChromeUISimUnlockURL[]; -extern const char kChromeUISlideshowURL[]; extern const char kChromeUISlowURL[]; extern const char kChromeUISystemInfoURL[]; extern const char kChromeUITermsOemURL[]; extern const char kChromeUIUserImageURL[]; +#endif // defined(OS_CHROMEOS) + +#if defined(OS_WIN) +extern const char kChromeUIMetroFlowURL[]; #endif #if defined(USE_AURA) extern const char kChromeUIGestureConfigURL[]; extern const char kChromeUIGestureConfigHost[]; -extern const char kChromeUISalsaURL[]; -extern const char kChromeUISalsaHost[]; #endif #if (defined(OS_LINUX) && defined(TOOLKIT_VIEWS)) || defined(USE_AURA) @@ -165,7 +157,6 @@ extern const char kChromeUICloudPrintResourcesHost[]; extern const char kChromeUICloudPrintSetupHost[]; extern const char kChromeUIConflictsHost[]; extern const char kChromeUIConstrainedHTMLTestHost[]; -extern const char kChromeUIContextualSearchPromoHost[]; extern const char kChromeUICrashesHost[]; extern const char kChromeUICrashHost[]; extern const char kChromeUICreditsHost[]; @@ -179,13 +170,11 @@ extern const char kChromeUIDNSHost[]; extern const char kChromeUIDomainReliabilityInternalsHost[]; extern const char kChromeUIDownloadsHost[]; extern const char kChromeUIDriveInternalsHost[]; -extern const char kChromeUIEditSearchEngineDialogHost[]; extern const char kChromeUIExtensionIconHost[]; extern const char kChromeUIExtensionsFrameHost[]; extern const char kChromeUIExtensionsHost[]; extern const char kChromeUIFallbackIconHost[]; extern const char kChromeUIFaviconHost[]; -extern const char kChromeUIFeedbackHost[]; extern const char kChromeUIFlagsHost[]; extern const char kChromeUIFlashHost[]; extern const char kChromeUIGCMInternalsHost[]; @@ -205,7 +194,6 @@ extern const char kChromeUILocalStateHost[]; extern const char kChromeUIMemoryHost[]; extern const char kChromeUIMemoryInternalsHost[]; extern const char kChromeUIMemoryRedirectHost[]; -extern const char kChromeUIMetroFlowHost[]; extern const char kChromeUIMdSettingsHost[]; extern const char kChromeUINaClHost[]; extern const char kChromeUINetExportHost[]; @@ -223,14 +211,12 @@ extern const char kChromeUIProfilerHost[]; extern const char kChromeUIQuotaInternalsHost[]; extern const char kChromeUIQuitHost[]; extern const char kChromeUIRestartHost[]; -extern const char kChromeUISessionFaviconHost[]; extern const char kChromeUISettingsHost[]; extern const char kChromeUISettingsFrameHost[]; extern const char kChromeUIShorthangHost[]; extern const char kChromeUISignInInternalsHost[]; extern const char kChromeUISuggestionsHost[]; extern const char kChromeUISuggestionsInternalsHost[]; -extern const char kChromeUISSLClientCertificateSelectorHost[]; extern const char kChromeUISupervisedUserPassphrasePageHost[]; extern const char kChromeUISyncHost[]; extern const char kChromeUISyncFileSystemInternalsHost[]; @@ -252,7 +238,6 @@ extern const char kChromeUIVoiceSearchHost[]; extern const char kChromeUIWebRTCDeviceProviderHost[]; extern const char kChromeUIWorkersHost[]; -extern const char kChromeUIScreenshotPath[]; extern const char kChromeUIThemePath[]; #if defined(ENABLE_PRINT_PREVIEW) @@ -264,6 +249,10 @@ extern const char kChromeUILinuxProxyConfigHost[]; extern const char kChromeUISandboxHost[]; #endif +#if defined(OS_ANDROID) +extern const char kChromeUIContextualSearchPromoHost[]; +#endif + #if defined(OS_CHROMEOS) extern const char kChromeUIActivationMessageHost[]; extern const char kChromeUIAppLaunchHost[]; @@ -271,16 +260,12 @@ extern const char kChromeUIBluetoothPairingHost[]; extern const char kChromeUICertificateManagerHost[]; extern const char kChromeUIChooseMobileNetworkHost[]; extern const char kChromeUICryptohomeHost[]; -extern const char kChromeUIDiagnosticsHost[]; extern const char kChromeUIDiscardsHost[]; extern const char kChromeUIFirstRunHost[]; -extern const char kChromeUIIdleLogoutDialogHost[]; extern const char kChromeUIImageBurnerHost[]; extern const char kChromeUIKeyboardOverlayHost[]; -extern const char kChromeUILockScreenHost[]; extern const char kChromeUILoginContainerHost[]; extern const char kChromeUILoginHost[]; -extern const char kChromeUIMediaplayerHost[]; extern const char kChromeUIMobileSetupHost[]; extern const char kChromeUINetworkHost[]; extern const char kChromeUINfcDebugHost[]; @@ -290,18 +275,14 @@ extern const char kChromeUIOSCreditsHost[]; extern const char kChromeUIPowerHost[]; extern const char kChromeUIProxySettingsHost[]; extern const char kChromeUIRotateHost[]; +extern const char kChromeUISalsaHost[]; extern const char kChromeUIScreenlockIconHost[]; extern const char kChromeUISetTimeHost[]; extern const char kChromeUISimUnlockHost[]; -extern const char kChromeUISlideshowHost[]; extern const char kChromeUISlowHost[]; extern const char kChromeUISlowTraceHost[]; extern const char kChromeUIUserImageHost[]; -extern const char kChromeUIMenu[]; -extern const char kChromeUINetworkMenu[]; -extern const char kChromeUIWrenchMenu[]; - extern const char kEULAPathFormat[]; extern const char kOemEulaURLPath[]; extern const char kOnlineEulaURLPath[]; @@ -310,6 +291,10 @@ extern const char kChromeOSCreditsPath[]; extern const char kChromeOSAssetHost[]; extern const char kChromeOSAssetPath[]; +#endif // defined(OS_CHROMEOS) + +#if defined(OS_WIN) +extern const char kChromeUIMetroFlowHost[]; #endif #if (defined(OS_LINUX) && defined(TOOLKIT_VIEWS)) || defined(USE_AURA) @@ -340,11 +325,9 @@ extern const char kResetProfileSettingsSubPage[]; extern const char kSearchEnginesSubPage[]; extern const char kSearchSubPage[]; extern const char kSearchUsersSubPage[]; -extern const char kSupervisedUserSettingsSubPage[]; extern const char kSyncSetupSubPage[]; #if defined(OS_CHROMEOS) extern const char kInternetOptionsSubPage[]; -extern const char kBluetoothAddDeviceSubPage[]; extern const char kChangeProfilePictureSubPage[]; #endif @@ -386,8 +369,10 @@ extern const char kChromeSyncLearnMoreURL[]; extern const char kChromeSyncMergeTroubleshootingURL[]; #endif +#if defined(OS_MACOSX) // "Learn more" URL for the enterprise sign-in confirmation dialog. extern const char kChromeEnterpriseSignInLearnMoreURL[]; +#endif // "Learn more" URL for resetting profile preferences. extern const char kResetProfileSettingsLearnMoreURL[]; @@ -440,8 +425,10 @@ extern const char kChromiumProjectURL[]; // first run dialog. extern const char kLearnMoreReportingURL[]; +#if defined(ENABLE_PLUGIN_INSTALLATION) // The URL for the "Learn more" page for the outdated plugin infobar. extern const char kOutdatedPluginLearnMoreURL[]; +#endif // The URL for the "Learn more" page for the blocked plugin infobar. extern const char kBlockedPluginLearnMoreURL[]; @@ -488,7 +475,9 @@ extern const char kLearnMoreEnterpriseURL[]; // The URL for the Learn More link of the non-CWS bubble. extern const char kRemoveNonCWSExtensionURL[]; +#if defined(OS_WIN) extern const char kNotificationsHelpURL[]; +#endif // The Welcome Notification More Info URL. extern const char kNotificationWelcomeLearnMoreURL[]; diff --git a/chrome/installer/util/util_constants.cc b/chrome/installer/util/util_constants.cc index 6975262..bfb5406 100644 --- a/chrome/installer/util/util_constants.cc +++ b/chrome/installer/util/util_constants.cc @@ -186,6 +186,15 @@ const char kOutputFile[] = "output-file"; } // namespace switches +namespace env_vars { + +// The presence of this environment variable with a value of 1 implies that +// setup.exe should run as a system installation regardless of what is on the +// command line. +const char kGoogleUpdateIsMachineEnvVar[] = "GoogleUpdateIsMachine"; + +} // namespace env_vars + // The Active Setup executable will be an identical copy of setup.exe; this is // necessary because Windows' installer detection heuristics (which include // things like process name being "setup.exe") will otherwise force elevation diff --git a/chrome/installer/util/util_constants.h b/chrome/installer/util/util_constants.h index 5776ae7..b09e65e 100644 --- a/chrome/installer/util/util_constants.h +++ b/chrome/installer/util/util_constants.h @@ -183,6 +183,12 @@ extern const char kOutputFile[]; } // namespace switches +namespace env_vars { + +extern const char kGoogleUpdateIsMachineEnvVar[]; + +} // namespace env_vars + extern const wchar_t kActiveSetupExe[]; extern const wchar_t kAppLauncherGuid[]; extern const wchar_t kChromeDll[]; |