diff options
43 files changed, 59 insertions, 106 deletions
diff --git a/base/process/process_util_unittest.cc b/base/process/process_util_unittest.cc index be1a000..6c1a3f1 100644 --- a/base/process/process_util_unittest.cc +++ b/base/process/process_util_unittest.cc @@ -64,6 +64,12 @@ using base::FilePath; namespace { +const char kSignalFileSlow[] = "SlowChildProcess.die"; +const char kSignalFileKill[] = "KilledChildProcess.die"; + +#if defined(OS_POSIX) +const char kSignalFileTerm[] = "TerminatedChildProcess.die"; + #if defined(OS_ANDROID) const char kShellPath[] = "/system/bin/sh"; const char kPosixShell[] = "sh"; @@ -71,13 +77,7 @@ const char kPosixShell[] = "sh"; const char kShellPath[] = "/bin/sh"; const char kPosixShell[] = "bash"; #endif - -const char kSignalFileSlow[] = "SlowChildProcess.die"; -const char kSignalFileKill[] = "KilledChildProcess.die"; - -#if defined(OS_POSIX) -const char kSignalFileTerm[] = "TerminatedChildProcess.die"; -#endif +#endif // defined(OS_POSIX) #if defined(OS_WIN) const int kExpectedStillRunningExitCode = 0x102; diff --git a/chrome/browser/chrome_process_finder_win.cc b/chrome/browser/chrome_process_finder_win.cc index f7c3194..1be25ba 100644 --- a/chrome/browser/chrome_process_finder_win.cc +++ b/chrome/browser/chrome_process_finder_win.cc @@ -105,8 +105,6 @@ HWND FindRunningChromeWindow(const base::FilePath& user_data_dir) { NotifyChromeResult AttemptToNotifyRunningChrome(HWND remote_window, bool fast_start) { DCHECK(remote_window); - static const char kSearchUrl[] = - "http://www.google.com/search?q=%s&sourceid=chrome&ie=UTF-8"; DWORD process_id = 0; DWORD thread_id = GetWindowThreadProcessId(remote_window, &process_id); if (!thread_id || !process_id) diff --git a/chrome/browser/component_updater/sw_reporter_installer_win.cc b/chrome/browser/component_updater/sw_reporter_installer_win.cc index bdb8fcd..ad33c74 100644 --- a/chrome/browser/component_updater/sw_reporter_installer_win.cc +++ b/chrome/browser/component_updater/sw_reporter_installer_win.cc @@ -50,9 +50,6 @@ enum SRTCompleted { SRT_COMPLETED_MAX, }; -// The maximum number of times to retry a download on startup. -const int kMaxRetry = 20; - // CRX hash. The extension id is: gkmgaooipdjhmangpemjhigmamcehddo. The hash was // generated in Python with something like this: // hashlib.sha256().update(open("<file>.crx").read()[16:16+294]).digest(). diff --git a/chrome/browser/enumerate_modules_model_unittest_win.cc b/chrome/browser/enumerate_modules_model_unittest_win.cc index 3b1670d4..3be0ecd7 100644 --- a/chrome/browser/enumerate_modules_model_unittest_win.cc +++ b/chrome/browser/enumerate_modules_model_unittest_win.cc @@ -90,15 +90,12 @@ const ModuleEnumerator::Module kStandardModuleNoSignature = // Name, location, description and signature are compared by hashing. static const char kMatchName[] = "88e8c9e0"; // "bar.dll". -static const char kNoMatchName[] = "barfoo.dll"; static const char kMatchLocation[] = "e6ca7b1c"; // "c:\\foo\\". static const char kNoMatchLocation[] = "c:\\foobar\\"; static const char kMatchDesc[] = "5c4419a6"; // "Desc". -static const char kNoMatchDesc[] = "NoDesc"; static const char kVersionHigh[] = "2.0"; static const char kVersionLow[] = "0.5"; static const char kMatchSignature[] = "7bfd87e1"; // "Sig". -static const char kNoMatchSignature[] = "giS"; static const char kEmpty[] = ""; const struct MatchingEntryList { diff --git a/chrome/browser/extensions/api/gcd_private/gcd_private_apitest.cc b/chrome/browser/extensions/api/gcd_private/gcd_private_apitest.cc index 12360aa..3a3eaa6 100644 --- a/chrome/browser/extensions/api/gcd_private/gcd_private_apitest.cc +++ b/chrome/browser/extensions/api/gcd_private/gcd_private_apitest.cc @@ -144,6 +144,7 @@ const uint8 kGoodbyePacket[] = { 'o', 'c', 'a', 'l', 0x00, }; +#if !defined(OS_WIN) || defined(NDEBUG) const uint8 kQueryPacket[] = { // Header 0x00, 0x00, // ID is zeroed out @@ -159,6 +160,7 @@ const uint8 kQueryPacket[] = { 'p', 0x05, 'l', 'o', 'c', 'a', 'l', 0x00, 0x00, 0x0c, // TYPE is PTR. 0x00, 0x01, // CLASS is IN. }; +#endif // !defined(OS_WIN) || defined(NDEBUG) #endif // ENABLE_MDNS diff --git a/chrome/browser/hang_monitor/hung_window_detector.cc b/chrome/browser/hang_monitor/hung_window_detector.cc index 89d8be87..d58e36a 100644 --- a/chrome/browser/hang_monitor/hung_window_detector.cc +++ b/chrome/browser/hang_monitor/hung_window_detector.cc @@ -11,13 +11,6 @@ #include "chrome/browser/hang_monitor/hang_crash_dump_win.h" #include "content/public/common/result_codes.h" -namespace { - -// How long do we wait for the terminated thread or process to die (in ms) -static const int kTerminateTimeout = 2000; - -} // namespace - const wchar_t HungWindowDetector::kHungChildWindowTimeout[] = L"Chrome_HungChildWindowTimeout"; diff --git a/chrome/browser/install_verification/win/imported_module_verification.cc b/chrome/browser/install_verification/win/imported_module_verification.cc index 8672865..3d5abb6 100644 --- a/chrome/browser/install_verification/win/imported_module_verification.cc +++ b/chrome/browser/install_verification/win/imported_module_verification.cc @@ -16,6 +16,7 @@ namespace { +#if !defined(_WIN64) // We must make sure not to include modules here that are likely to get unloaded // because the scanning of the module is not done within a loader lock, so is // not resilient to changes made to the modules list. @@ -24,6 +25,7 @@ const wchar_t* const kModulesToScan[] = { L"kernel32.dll", L"user32.dll" }; +#endif // !defined(_WIN64) bool AddressBeyondRange(const ModuleInfo& module, uintptr_t address) { return module.base_address + module.size < address; diff --git a/chrome/browser/memory_details_win.cc b/chrome/browser/memory_details_win.cc index 8cb2056..bcb98db 100644 --- a/chrome/browser/memory_details_win.cc +++ b/chrome/browser/memory_details_win.cc @@ -25,7 +25,7 @@ using content::BrowserThread; // Known browsers which we collect details for. -enum { +enum BrowserProcess { CHROME_BROWSER = 0, CHROME_NACL_PROCESS, IE_BROWSER, @@ -35,7 +35,7 @@ enum { IE_64BIT_BROWSER, KONQUEROR_BROWSER, MAX_BROWSERS -} BrowserProcess; +}; MemoryDetails::MemoryDetails() { base::FilePath browser_process_path; diff --git a/chrome/browser/ui/browser_focus_uitest.cc b/chrome/browser/ui/browser_focus_uitest.cc index e5ea890..b063b87 100644 --- a/chrome/browser/ui/browser_focus_uitest.cc +++ b/chrome/browser/ui/browser_focus_uitest.cc @@ -55,9 +55,11 @@ using content::WebContents; namespace { +#if defined(OS_POSIX) // The delay waited in some cases where we don't have a notifications for an // action we take. const int kActionDelayMs = 500; +#endif const char kSimplePage[] = "/focus/page_with_focus.html"; const char kStealFocusPage[] = "/focus/page_steals_focus.html"; diff --git a/chrome/browser/ui/extensions/extension_message_bubble_factory.cc b/chrome/browser/ui/extensions/extension_message_bubble_factory.cc index f079253..3a73806 100644 --- a/chrome/browser/ui/extensions/extension_message_bubble_factory.cc +++ b/chrome/browser/ui/extensions/extension_message_bubble_factory.cc @@ -33,7 +33,9 @@ bool g_enabled_for_tests = false; const char kEnableDevModeWarningExperimentName[] = "ExtensionDeveloperModeWarning"; +#if !defined(OS_WIN) const char kEnableProxyWarningExperimentName[] = "ExtensionProxyWarning"; +#endif bool IsExperimentEnabled(const char* experiment_name) { // Don't allow turning it off via command line. diff --git a/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc b/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc index 22d9fd2..835dd27 100644 --- a/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc +++ b/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc @@ -76,8 +76,10 @@ const int kResizeAreaCornerSize = 16; // The content left/right images have a shadow built into them. const int kContentEdgeShadowThickness = 2; +#if !defined(OS_WIN) // The icon never shrinks below 16 px on a side. const int kIconMinimumSize = 16; +#endif #if defined(OS_LINUX) && !defined(OS_CHROMEOS) // The number of pixels to move the frame background image upwards when using diff --git a/chrome/common/chrome_paths.cc b/chrome/common/chrome_paths.cc index b5fd5b5..ea52e2c 100644 --- a/chrome/common/chrome_paths.cc +++ b/chrome/common/chrome_paths.cc @@ -55,10 +55,7 @@ const base::FilePath::CharType kInternalFlashPluginFileName[] = const base::FilePath::CharType kPepperFlashBaseDirectory[] = FILE_PATH_LITERAL("PepperFlash"); -#if defined(OS_WIN) -const base::FilePath::CharType kPepperFlashSystemBaseDirectory[] = - FILE_PATH_LITERAL("Macromed\\Flash"); -#elif defined(OS_MACOSX) && !defined(OS_IOS) +#if defined(OS_MACOSX) && !defined(OS_IOS) const base::FilePath::CharType kPepperFlashSystemBaseDirectory[] = FILE_PATH_LITERAL("Internet Plug-Ins/PepperFlashPlayer"); #endif diff --git a/chrome/installer/gcapi/gcapi.cc b/chrome/installer/gcapi/gcapi.cc index a560b7b..bc649b8 100644 --- a/chrome/installer/gcapi/gcapi.cc +++ b/chrome/installer/gcapi/gcapi.cc @@ -58,14 +58,9 @@ const wchar_t kChromeRegClientsKey[] = const wchar_t kChromeRegClientStateKey[] = L"Software\\Google\\Update\\ClientState\\" L"{8A69D345-D564-463c-AFF1-A69D9E530F96}"; -const wchar_t kChromeRegClientStateMediumKey[] = - L"Software\\Google\\Update\\ClientStateMedium\\" - L"{8A69D345-D564-463c-AFF1-A69D9E530F96}"; const wchar_t kGCAPITempKey[] = L"Software\\Google\\GCAPITemp"; -const wchar_t kChromeRegLaunchCmd[] = L"InstallerSuccessLaunchCmdLine"; -const wchar_t kChromeRegLastLaunchCmd[] = L"LastInstallerSuccessLaunchCmdLine"; const wchar_t kChromeRegVersion[] = L"pv"; const wchar_t kNoChromeOfferUntil[] = L"SOFTWARE\\Google\\No Chrome Offer Until"; diff --git a/chrome/installer/setup/install_worker_unittest.cc b/chrome/installer/setup/install_worker_unittest.cc index f53a48e..edd3363 100644 --- a/chrome/installer/setup/install_worker_unittest.cc +++ b/chrome/installer/setup/install_worker_unittest.cc @@ -502,9 +502,6 @@ TEST_F(InstallWorkerTest, TestInstallChromeSingleSystem) { namespace { -const wchar_t elevation_key[] = - L"SOFTWARE\\Microsoft\\Internet Explorer\\Low Rights\\ElevationPolicy\\" - L"{E0A900DF-9611-4446-86BD-4B1D47E7DB2A}"; const wchar_t old_elevation_key[] = L"SOFTWARE\\Microsoft\\Internet Explorer\\Low Rights\\ElevationPolicy\\" L"{6C288DD7-76FB-4721-B628-56FAC252E199}"; diff --git a/chrome/installer/setup/setup_main.cc b/chrome/installer/setup/setup_main.cc index 0fc346d..93eb38d4 100644 --- a/chrome/installer/setup/setup_main.cc +++ b/chrome/installer/setup/setup_main.cc @@ -78,7 +78,6 @@ using installer::Product; using installer::ProductState; using installer::Products; -const wchar_t kChromePipeName[] = L"\\\\.\\pipe\\ChromeCrashServices"; const wchar_t kGoogleUpdatePipeName[] = L"\\\\.\\pipe\\GoogleCrashServices\\"; const wchar_t kSystemPrincipalSid[] = L"S-1-5-18"; diff --git a/chrome/installer/test/alternate_version_generator.cc b/chrome/installer/test/alternate_version_generator.cc index 41ecf11..2e96737 100644 --- a/chrome/installer/test/alternate_version_generator.cc +++ b/chrome/installer/test/alternate_version_generator.cc @@ -57,7 +57,6 @@ const wchar_t k7zaExe[] = L"7za.exe"; const wchar_t k7zaPathRelative[] = L"..\\..\\third_party\\lzma_sdk\\Executable"; const wchar_t kB7[] = L"B7"; const wchar_t kBl[] = L"BL"; -const wchar_t kChrome7z[] = L"chrome.7z"; const wchar_t kChromeBin[] = L"Chrome-bin"; const wchar_t kChromePacked7z[] = L"chrome.packed.7z"; const wchar_t kExe[] = L"exe"; diff --git a/chrome/installer/util/google_update_settings_unittest.cc b/chrome/installer/util/google_update_settings_unittest.cc index 46b933b..1a8afaad 100644 --- a/chrome/installer/util/google_update_settings_unittest.cc +++ b/chrome/installer/util/google_update_settings_unittest.cc @@ -32,7 +32,10 @@ using installer::ChannelInfo; namespace { const wchar_t kTestProductGuid[] = L"{89F1B351-B15D-48D4-8F10-1298721CF13D}"; + +#if defined(GOOGLE_CHROME_BUILD) const wchar_t kTestExperimentLabel[] = L"test_label_value"; +#endif // This test fixture redirects the HKLM and HKCU registry hives for // the duration of the test to make it independent of the machine diff --git a/chrome/installer/util/language_selector.cc b/chrome/installer/util/language_selector.cc index a828913..a29ec1f 100644 --- a/chrome/installer/util/language_selector.cc +++ b/chrome/installer/util/language_selector.cc @@ -28,9 +28,6 @@ struct LangToOffset { const wchar_t kFallbackLanguage[] = L"en-us"; const int kFallbackLanguageOffset = IDS_L10N_OFFSET_EN_US; -// http://tools.ietf.org/html/rfc5646 Section 2.3.3 -const std::wstring::size_type kScriptSubtagLength = 4; - // A sorted array of language identifiers (and their offsets) for which // translations are available. The contents of the array are generated by // create_string_rc.py. diff --git a/chrome_elf/breakpad.cc b/chrome_elf/breakpad.cc index 4eeb129..3c95a4f 100644 --- a/chrome_elf/breakpad.cc +++ b/chrome_elf/breakpad.cc @@ -36,7 +36,6 @@ const wchar_t kGoogleUpdatePipeName[] = L"\\\\.\\pipe\\GoogleCrashServices\\"; const wchar_t kSystemPrincipalSid[] = L"S-1-5-18"; const wchar_t kNoErrorDialogs[] = L"noerrdialogs"; -const wchar_t kChromeHeadless[] = L"CHROME_HEADLESS"; google_breakpad::CustomClientInfo* GetCustomInfo() { base::string16 process = IsNonBrowserProcess() ? L"renderer" : L"browser"; diff --git a/cloud_print/common/win/install_utils.cc b/cloud_print/common/win/install_utils.cc index 31b4377..eed09b3 100644 --- a/cloud_print/common/win/install_utils.cc +++ b/cloud_print/common/win/install_utils.cc @@ -22,7 +22,6 @@ namespace { // Google Update related constants. const wchar_t kClientsKey[] = L"SOFTWARE\\Google\\Update\\Clients\\"; const wchar_t kClientStateKey[] = L"SOFTWARE\\Google\\Update\\ClientState\\"; -const wchar_t* kUsageKey = L"dr"; const wchar_t kVersionKey[] = L"pv"; const wchar_t kNameKey[] = L"name"; diff --git a/cloud_print/virtual_driver/win/virtual_driver_helpers.cc b/cloud_print/virtual_driver/win/virtual_driver_helpers.cc index 0f31afa..da4ec5c 100644 --- a/cloud_print/virtual_driver/win/virtual_driver_helpers.cc +++ b/cloud_print/virtual_driver/win/virtual_driver_helpers.cc @@ -15,8 +15,6 @@ namespace cloud_print { -const size_t kMaxMessageLen = 100; - void DisplayWindowsMessage(HWND hwnd, HRESULT hr, const base::string16 &caption) { ::MessageBox(hwnd, GetErrorMessage(hr).c_str(), caption.c_str(), MB_OK); diff --git a/components/autofill/core/browser/autofill_ie_toolbar_import_win_unittest.cc b/components/autofill/core/browser/autofill_ie_toolbar_import_win_unittest.cc index 5eb9c82..e4c90d7 100644 --- a/components/autofill/core/browser/autofill_ie_toolbar_import_win_unittest.cc +++ b/components/autofill/core/browser/autofill_ie_toolbar_import_win_unittest.cc @@ -28,12 +28,12 @@ const wchar_t kUnitTestRegistrySubKey[] = L"SOFTWARE\\Chromium Unit Tests"; const wchar_t kUnitTestUserOverrideSubKey[] = L"SOFTWARE\\Chromium Unit Tests\\HKCU Override"; -const wchar_t* const kProfileKey = +const wchar_t kProfileKey[] = L"Software\\Google\\Google Toolbar\\4.0\\Autofill\\Profiles"; -const wchar_t* const kCreditCardKey = +const wchar_t kCreditCardKey[] = L"Software\\Google\\Google Toolbar\\4.0\\Autofill\\Credit Cards"; -const wchar_t* const kPasswordHashValue = L"password_hash"; -const wchar_t* const kSaltValue = L"salt"; +const wchar_t kPasswordHashValue[] = L"password_hash"; +const wchar_t kSaltValue[] = L"salt"; struct ValueDescription { wchar_t const* const value_name; @@ -70,19 +70,20 @@ ValueDescription credit_card[] = { }; ValueDescription empty_salt = { - L"salt", L"\x1\x2\x3\x4\x5\x6\x7\x8\x9\xA\xB\xC\xD\xE\xF\x10\x11\x12\x13\x14" + kSaltValue, + L"\x1\x2\x3\x4\x5\x6\x7\x8\x9\xA\xB\xC\xD\xE\xF\x10\x11\x12\x13\x14" }; ValueDescription empty_password = { - L"password_hash", L"" + kPasswordHashValue, L"" }; ValueDescription protected_salt = { - L"salt", L"\x4854\xB906\x9C7C\x50A6\x4376\xFD9D\x1E02" + kSaltValue, L"\x4854\xB906\x9C7C\x50A6\x4376\xFD9D\x1E02" }; ValueDescription protected_password = { - L"password_hash", L"\x18B7\xE586\x459B\x7457\xA066\x3842\x71DA" + kPasswordHashValue, L"\x18B7\xE586\x459B\x7457\xA066\x3842\x71DA" }; void EncryptAndWrite(RegKey* key, const ValueDescription* value) { diff --git a/components/crash/app/breakpad_win.cc b/components/crash/app/breakpad_win.cc index bfce051..bee4fab 100644 --- a/components/crash/app/breakpad_win.cc +++ b/components/crash/app/breakpad_win.cc @@ -94,9 +94,11 @@ const wchar_t kSystemPrincipalSid[] =L"S-1-5-18"; google_breakpad::ExceptionHandler* g_breakpad = NULL; google_breakpad::ExceptionHandler* g_dumphandler_no_crash = NULL; +#if !defined(_WIN64) EXCEPTION_POINTERS g_surrogate_exception_pointers = {0}; EXCEPTION_RECORD g_surrogate_exception_record = {0}; CONTEXT g_surrogate_context = {0}; +#endif // !defined(_WIN64) typedef NTSTATUS (WINAPI* NtTerminateProcessPtr)(HANDLE ProcessHandle, NTSTATUS ExitStatus); diff --git a/components/printing/test/print_web_view_helper_browsertest.cc b/components/printing/test/print_web_view_helper_browsertest.cc index 82d9493..28d2523 100644 --- a/components/printing/test/print_web_view_helper_browsertest.cc +++ b/components/printing/test/print_web_view_helper_browsertest.cc @@ -404,7 +404,7 @@ struct TestPageData { const wchar_t* file; }; -#if defined(OS_WIN) || defined(OS_MACOSX) +#if defined(OS_MACOSX) && defined(ENABLE_BASIC_PRINTING) const TestPageData kTestPages[] = { { "<html>" @@ -417,23 +417,17 @@ const TestPageData kTestPages[] = { "<body style=\"background-color: white;\">" "<p style=\"font-family: arial;\">Hello World!</p>" "</body>", -#if defined(OS_MACOSX) - // Mac printing code compensates for the WebKit scale factor while - // generating - // the metafile, so we expect smaller pages. 1, + // Mac printing code compensates for the WebKit scale factor while + // generating the metafile, so we expect smaller pages. (On non-Mac + // platforms, this would be 675x900). 600, 780, -#else - 1, - 675, - 900, -#endif NULL, NULL, }, }; -#endif // defined(OS_WIN) || defined(OS_MACOSX) +#endif // defined(OS_MACOSX) && defined(ENABLE_BASIC_PRINTING) } // namespace // TODO(estade): need to port MockPrinter to get this on Linux. This involves diff --git a/content/browser/download/base_file_win.cc b/content/browser/download/base_file_win.cc index 6e836c7..870feb6 100644 --- a/content/browser/download/base_file_win.cc +++ b/content/browser/download/base_file_win.cc @@ -338,7 +338,6 @@ DownloadInterruptReason BaseFile::MoveFileAndAdjustPermissions( move_info.fFlags = FOF_SILENT | FOF_NOCONFIRMATION | FOF_NOERRORUI | FOF_NOCONFIRMMKDIR | FOF_NOCOPYSECURITYATTRIBS; - base::TimeTicks now = base::TimeTicks::Now(); int result = SHFileOperation(&move_info); DownloadInterruptReason interrupt_reason = DOWNLOAD_INTERRUPT_REASON_NONE; diff --git a/content/child/npapi/webplugin_delegate_impl_win.cc b/content/child/npapi/webplugin_delegate_impl_win.cc index 5ebab62..0249f69 100644 --- a/content/child/npapi/webplugin_delegate_impl_win.cc +++ b/content/child/npapi/webplugin_delegate_impl_win.cc @@ -43,7 +43,6 @@ namespace content { namespace { const wchar_t kWebPluginDelegateProperty[] = L"WebPluginDelegateProperty"; -const wchar_t kPluginFlashThrottle[] = L"FlashThrottle"; // The fastest we are willing to process WM_USER+1 events for Flash. // Flash can easily exceed the limits of our CPU if we don't throttle it. diff --git a/content/common/plugin_list_win.cc b/content/common/plugin_list_win.cc index ccc994b..6c95a0d 100644 --- a/content/common/plugin_list_win.cc +++ b/content/common/plugin_list_win.cc @@ -28,7 +28,6 @@ namespace { const base::char16 kRegistryApps[] = L"Software\\Microsoft\\Windows\\CurrentVersion\\App Paths"; -const base::char16 kRegistryFirefox[] = L"firefox.exe"; const base::char16 kRegistryAcrobat[] = L"Acrobat.exe"; const base::char16 kRegistryAcrobatReader[] = L"AcroRd32.exe"; const base::char16 kRegistryWindowsMedia[] = L"wmplayer.exe"; diff --git a/device/bluetooth/bluetooth_device_win.cc b/device/bluetooth/bluetooth_device_win.cc index de00817..ed51d4b 100644 --- a/device/bluetooth/bluetooth_device_win.cc +++ b/device/bluetooth/bluetooth_device_win.cc @@ -20,8 +20,6 @@ namespace { -const int kSdpBytesBufferSize = 1024; - const char kApiUnavailable[] = "This API is not implemented on this platform."; } // namespace diff --git a/device/bluetooth/bluetooth_service_record_win_unittest.cc b/device/bluetooth/bluetooth_service_record_win_unittest.cc index 8128cb4..274028e 100644 --- a/device/bluetooth/bluetooth_service_record_win_unittest.cc +++ b/device/bluetooth/bluetooth_service_record_win_unittest.cc @@ -14,14 +14,12 @@ const char kTestNoRfcommSdpBytes[] = "35510900000a00010001090001350319110a09000435103506190100090019350619001909" "010209000535031910020900093508350619110d090102090100250c417564696f20536f75" "726365090311090001"; -const int kTestNoRfcommSdpBytesSize = sizeof(kTestNoRfcommSdpBytes) / 2; const device::BluetoothUUID kTestNoRfcommSdpUuid("110a"); const char kTestRfcommSdpBytes[] = "354b0900000a000100030900013506191112191203090004350c3503190100350519000308" "0b090005350319100209000935083506191108090100090100250d566f6963652047617465" "776179"; -const int kTestRfcommSdpBytesSize = sizeof(kTestRfcommSdpBytes) / 2; const device::BluetoothUUID kTestRfcommSdpUuid("1112"); const int kTestRfcommChannel = 11; diff --git a/ipc/ipc_channel_win.cc b/ipc/ipc_channel_win.cc index 6f41fd6..05b9475 100644 --- a/ipc/ipc_channel_win.cc +++ b/ipc/ipc_channel_win.cc @@ -69,7 +69,6 @@ void ChannelWin::Close() { pipe_.Close(); // Make sure all IO has completed. - base::Time start = base::Time::Now(); while (input_state_.is_pending || output_state_.is_pending) { base::MessageLoopForIO::current()->WaitForIOCompletion(INFINITE, this); } diff --git a/media/audio/win/audio_output_win_unittest.cc b/media/audio/win/audio_output_win_unittest.cc index 3ef817b..3ce3df3 100644 --- a/media/audio/win/audio_output_win_unittest.cc +++ b/media/audio/win/audio_output_win_unittest.cc @@ -32,9 +32,6 @@ using ::testing::Return; namespace media { -static const wchar_t kAudioFile1_16b_m_16K[] - = L"media\\test\\data\\sweep02_16b_mono_16KHz.raw"; - static int ClearData(AudioBus* audio_bus, uint32 total_bytes_delay) { audio_bus->Zero(); return audio_bus->frames(); diff --git a/media/test/data/sweep02_16b_mono_16KHz.raw b/media/test/data/sweep02_16b_mono_16KHz.raw Binary files differdeleted file mode 100644 index 5dd4dc4..0000000 --- a/media/test/data/sweep02_16b_mono_16KHz.raw +++ /dev/null diff --git a/net/proxy/dhcp_proxy_script_fetcher_win.cc b/net/proxy/dhcp_proxy_script_fetcher_win.cc index b777da5..bf3e9d6 100644 --- a/net/proxy/dhcp_proxy_script_fetcher_win.cc +++ b/net/proxy/dhcp_proxy_script_fetcher_win.cc @@ -43,14 +43,6 @@ const int kMaxDhcpLookupThreads = 12; // adapter finishes first. const int kMaxWaitAfterFirstResultMs = 400; -const int kGetAdaptersAddressesErrors[] = { - ERROR_ADDRESS_NOT_ASSOCIATED, - ERROR_BUFFER_OVERFLOW, - ERROR_INVALID_PARAMETER, - ERROR_NOT_ENOUGH_MEMORY, - ERROR_NO_DATA, -}; - } // namespace namespace net { diff --git a/ppapi/proxy/video_decoder_resource_unittest.cc b/ppapi/proxy/video_decoder_resource_unittest.cc index 7716940..c07f3b0 100644 --- a/ppapi/proxy/video_decoder_resource_unittest.cc +++ b/ppapi/proxy/video_decoder_resource_unittest.cc @@ -31,7 +31,9 @@ const uint32_t kShmSize = 256; const size_t kDecodeBufferSize = 16; const uint32_t kDecodeId = 5; const uint32_t kTextureId1 = 1; +#if !defined(OS_WIN) || !defined(ARCH_CPU_64_BITS) const uint32_t kTextureId2 = 2; +#endif const uint32_t kNumRequestedTextures = 2; class MockCompletionCallback { diff --git a/remoting/host/local_input_monitor_win.cc b/remoting/host/local_input_monitor_win.cc index fd5a5f7..1b92e03 100644 --- a/remoting/host/local_input_monitor_win.cc +++ b/remoting/host/local_input_monitor_win.cc @@ -19,8 +19,6 @@ namespace remoting { namespace { -const wchar_t kWindowClassFormat[] = L"Chromoting_LocalInputMonitorWin_%p"; - // From the HID Usage Tables specification. const USHORT kGenericDesktopPage = 1; const USHORT kMouseUsage = 2; diff --git a/remoting/host/remoting_me2me_host.cc b/remoting/host/remoting_me2me_host.cc index 00e41a4..fb6907c 100644 --- a/remoting/host/remoting_me2me_host.cc +++ b/remoting/host/remoting_me2me_host.cc @@ -116,9 +116,15 @@ using remoting::protocol::NetworkSettings; namespace { +#if !defined(REMOTING_MULTI_PROCESS) // This is used for tagging system event logs. const char kApplicationName[] = "chromoting"; +// Value used for --host-config option to indicate that the path must be read +// from stdin. +const char kStdinConfigPath[] = "-"; +#endif // !defined(REMOTING_MULTI_PROCESS) + #if defined(OS_LINUX) // The command line switch used to pass name of the pipe to capture audio on // linux. @@ -139,10 +145,6 @@ const char kEnableVp9SwitchName[] = "enable-vp9"; // Command line switch used to enable and configure the frame-recorder. const char kFrameRecorderBufferKbName[] = "frame-recorder-buffer-kb"; -// Value used for --host-config option to indicate that the path must be read -// from stdin. -const char kStdinConfigPath[] = "-"; - const char kWindowIdSwitchName[] = "window-id"; // Maximum time to wait for clean shutdown to occur, before forcing termination diff --git a/sandbox/win/src/interception.cc b/sandbox/win/src/interception.cc index 60dd440..283c942 100644 --- a/sandbox/win/src/interception.cc +++ b/sandbox/win/src/interception.cc @@ -24,9 +24,6 @@ namespace { -const char kMapViewOfSectionName[] = "NtMapViewOfSection"; -const char kUnmapViewOfSectionName[] = "NtUnmapViewOfSection"; - // Standard allocation granularity and page size for Windows. const size_t kAllocGranularity = 65536; const size_t kPageSize = 4096; diff --git a/sandbox/win/src/process_mitigations_test.cc b/sandbox/win/src/process_mitigations_test.cc index 4d2e9c6..5fe55d7c 100644 --- a/sandbox/win/src/process_mitigations_test.cc +++ b/sandbox/win/src/process_mitigations_test.cc @@ -165,9 +165,7 @@ SBOX_TESTS_COMMAND int CheckDep(int argc, wchar_t **argv) { return SBOX_TEST_THIRD_ERROR; } - static const int MEM_EXECUTE_OPTION_ENABLE = 1; static const int MEM_EXECUTE_OPTION_DISABLE = 2; - static const int MEM_EXECUTE_OPTION_ATL7_THUNK_EMULATION = 4; static const int MEM_EXECUTE_OPTION_PERMANENT = 8; dep_flags &= 0xff; diff --git a/ui/app_list/views/app_list_item_view.cc b/ui/app_list/views/app_list_item_view.cc index e6b55bf..c5a8b33 100644 --- a/ui/app_list/views/app_list_item_view.cc +++ b/ui/app_list/views/app_list_item_view.cc @@ -49,8 +49,10 @@ const int kFolderPreviewRadius = 40; const int kLeftRightPaddingChars = 1; +#if !defined(OS_WIN) // Scale to transform the icon when a drag starts. const float kDraggingIconScale = 1.5f; +#endif // Delay in milliseconds of when the dragging UI should be shown for mouse drag. const int kMouseDragUIDelayInMs = 200; diff --git a/ui/aura/window_tree_host_win.cc b/ui/aura/window_tree_host_win.cc index 6f879ab..810b5e1 100644 --- a/ui/aura/window_tree_host_win.cc +++ b/ui/aura/window_tree_host_win.cc @@ -25,11 +25,6 @@ using std::max; using std::min; namespace aura { -namespace { - -bool use_popup_as_root_window_for_test = false; - -} // namespace // static WindowTreeHost* WindowTreeHost::Create(const gfx::Rect& bounds) { diff --git a/ui/base/win/atl_module.h b/ui/base/win/atl_module.h index 1d1adb4..8b69697 100644 --- a/ui/base/win/atl_module.h +++ b/ui/base/win/atl_module.h @@ -9,6 +9,8 @@ #include <atlcom.h> #include "base/basictypes.h" +#include "base/compiler_specific.h" +#include "base/macros.h" namespace ui { namespace win { @@ -28,6 +30,7 @@ static void CreateATLModuleIfNeeded() { if (_pAtlModule == NULL) { // This creates the module and automatically updates _pAtlModule. CR_DEFINE_STATIC_LOCAL(CComModule, module, ()); + ALLOW_UNUSED_LOCAL(module); } } diff --git a/ui/gfx/win/dpi.cc b/ui/gfx/win/dpi.cc index ceaaefd..aa3194c 100644 --- a/ui/gfx/win/dpi.cc +++ b/ui/gfx/win/dpi.cc @@ -13,10 +13,7 @@ namespace { -int kDefaultDPIX = 96; -int kDefaultDPIY = 96; - -bool force_highdpi_for_testing = false; +int kDefaultDPI = 96; float g_device_scale_factor = 0.0f; @@ -26,7 +23,7 @@ float GetUnforcedDeviceScaleFactor() { if (g_device_scale_factor) return g_device_scale_factor; return static_cast<float>(gfx::GetDPI().width()) / - static_cast<float>(kDefaultDPIX); + static_cast<float>(kDefaultDPI); } } // namespace diff --git a/ui/views/window/custom_frame_view.cc b/ui/views/window/custom_frame_view.cc index 62a0507..d048ec8 100644 --- a/ui/views/window/custom_frame_view.cc +++ b/ui/views/window/custom_frame_view.cc @@ -48,13 +48,16 @@ const int kCaptionButtonHeightWithPadding = 19; const int kTitlebarTopAndBottomEdgeThickness = 2; // The icon is inset 2 px from the left frame border. const int kIconLeftSpacing = 2; -// The icon never shrinks below 16 px on a side. -const int kIconMinimumSize = 16; // The space between the window icon and the title text. const int kTitleIconOffsetX = 4; // The space between the title text and the caption buttons. const int kTitleCaptionSpacing = 5; +#if !defined(OS_WIN) +// The icon never shrinks below 16 px on a side. +const int kIconMinimumSize = 16; +#endif + #if defined(OS_CHROMEOS) // Chrome OS uses a dark gray. const SkColor kDefaultColorFrame = SkColorSetRGB(109, 109, 109); |