diff options
5 files changed, 27 insertions, 9 deletions
diff --git a/cloud_print/service/win/cloud_print_service_config.cc b/cloud_print/service/win/cloud_print_service_config.cc index a0f5044..2db3241 100644 --- a/cloud_print/service/win/cloud_print_service_config.cc +++ b/cloud_print/service/win/cloud_print_service_config.cc @@ -63,7 +63,11 @@ class SetupDialog : public base::RefCounted<SetupDialog>, END_MSG_MAP() SetupDialog(); + private: + friend class base::RefCounted<SetupDialog>; + ~SetupDialog() {} + // Window Message Handlers LRESULT OnInitDialog(UINT message, WPARAM wparam, LPARAM lparam, BOOL& handled); diff --git a/content/browser/gamepad/raw_input_data_fetcher_win.cc b/content/browser/gamepad/raw_input_data_fetcher_win.cc index 68f5da5..00e64e5 100644 --- a/content/browser/gamepad/raw_input_data_fetcher_win.cc +++ b/content/browser/gamepad/raw_input_data_fetcher_win.cc @@ -28,13 +28,20 @@ USHORT DeviceUsages[] = { const uint32_t kAxisMinimumUsageNumber = 0x30; const uint32_t kGameControlsUsagePage = 0x05; -} // namespace +} // namespace + +RawGamepadInfo::RawGamepadInfo() { +} + +RawGamepadInfo::~RawGamepadInfo() { +} RawInputDataFetcher::RawInputDataFetcher() - : hid_dll_(base::FilePath(FILE_PATH_LITERAL("hid.dll"))) - , rawinput_available_(GetHidDllFunctions()) - , filter_xinput_(true) - , events_monitored_(false) {} + : hid_dll_(base::FilePath(FILE_PATH_LITERAL("hid.dll"))), + rawinput_available_(GetHidDllFunctions()), + filter_xinput_(true), + events_monitored_(false) { +} RawInputDataFetcher::~RawInputDataFetcher() { ClearControllers(); @@ -446,9 +453,9 @@ LRESULT RawInputDataFetcher::OnInput(HRAWINPUT input_handle) { } bool RawInputDataFetcher::HandleMessage(UINT message, - WPARAM wparam, - LPARAM lparam, - LRESULT* result) { + WPARAM wparam, + LPARAM lparam, + LRESULT* result) { switch (message) { case WM_INPUT: *result = OnInput(reinterpret_cast<HRAWINPUT>(lparam)); diff --git a/content/browser/gamepad/raw_input_data_fetcher_win.h b/content/browser/gamepad/raw_input_data_fetcher_win.h index 508f407..fe42d3c 100644 --- a/content/browser/gamepad/raw_input_data_fetcher_win.h +++ b/content/browser/gamepad/raw_input_data_fetcher_win.h @@ -34,6 +34,9 @@ struct RawGamepadAxis { }; struct RawGamepadInfo { + RawGamepadInfo(); + ~RawGamepadInfo(); + HANDLE handle; scoped_ptr<uint8[]> ppd_buffer; PHIDP_PREPARSED_DATA preparsed_data; diff --git a/content/browser/power_profiler/power_data_provider_ia_win.cc b/content/browser/power_profiler/power_data_provider_ia_win.cc index 2127ae2..e6509ea 100644 --- a/content/browser/power_profiler/power_data_provider_ia_win.cc +++ b/content/browser/power_profiler/power_data_provider_ia_win.cc @@ -64,6 +64,10 @@ base::TimeDelta PowerDataProviderIA::GetSamplingRate() { return base::TimeDelta::FromMilliseconds(kDefaultSamplePeriodMs); } +PowerDataProvider::AccuracyLevel PowerDataProviderIA::GetAccuracyLevel() { + return High; +} + bool PowerDataProviderIA::Initialize() { if (is_open_) return true; diff --git a/content/browser/power_profiler/power_data_provider_ia_win.h b/content/browser/power_profiler/power_data_provider_ia_win.h index 68d220d..8356fec 100644 --- a/content/browser/power_profiler/power_data_provider_ia_win.h +++ b/content/browser/power_profiler/power_data_provider_ia_win.h @@ -22,7 +22,7 @@ class PowerDataProviderIA : public PowerDataProvider { // PowerDataProvider: PowerEventVector GetData() override; base::TimeDelta GetSamplingRate() override; - AccuracyLevel GetAccuracyLevel() override { return High; } + AccuracyLevel GetAccuracyLevel() override; private: CIntelPowerGadgetLib energy_lib_; |