diff options
| author | sammc <sammc@chromium.org> | 2015-07-01 18:25:00 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-07-02 01:25:35 +0000 |
| commit | 5648c8598f20bc9756a82cf90cee204db44ea269 (patch) | |
| tree | c64a9115d6d3dd5e79a6c92c4de1072ccd197316 /win8 | |
| parent | 984fbc18b3c734abdef6a36f547f5eb99a2143d4 (diff) | |
| download | chromium_src-5648c8598f20bc9756a82cf90cee204db44ea269.zip chromium_src-5648c8598f20bc9756a82cf90cee204db44ea269.tar.gz chromium_src-5648c8598f20bc9756a82cf90cee204db44ea269.tar.bz2 | |
clang/win: Fix warnings to prepare for building without -Wno-reorder.
This changes constructor initializer list ordering to match field
declaration ordering, except for gtest and breakpad, where the warning
is disabled.
BUG=505304
NOPRESUBMIT=true
Review URL: https://codereview.chromium.org/1210013007
Cr-Commit-Position: refs/heads/master@{#337152}
Diffstat (limited to 'win8')
| -rw-r--r-- | win8/metro_driver/chrome_app_view_ash.cc | 2 | ||||
| -rw-r--r-- | win8/metro_driver/file_picker_ash.cc | 4 | ||||
| -rw-r--r-- | win8/metro_driver/ime/text_store.cc | 4 | ||||
| -rw-r--r-- | win8/metro_driver/metro_driver_win7.cc | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/win8/metro_driver/chrome_app_view_ash.cc b/win8/metro_driver/chrome_app_view_ash.cc index 65e07ba..5ec2b20 100644 --- a/win8/metro_driver/chrome_app_view_ash.cc +++ b/win8/metro_driver/chrome_app_view_ash.cc @@ -348,9 +348,9 @@ class ChromeAppViewAsh::PointerInfoHandler { : x_(0), y_(0), wheel_delta_(0), + pointer_id_(0), update_kind_(winui::Input::PointerUpdateKind_Other), timestamp_(0), - pointer_id_(0), mouse_down_flags_(0), is_horizontal_wheel_(0), metro_dpi_scale_(metro_dpi_scale), diff --git a/win8/metro_driver/file_picker_ash.cc b/win8/metro_driver/file_picker_ash.cc index d88d286..e45301c 100644 --- a/win8/metro_driver/file_picker_ash.cc +++ b/win8/metro_driver/file_picker_ash.cc @@ -84,11 +84,11 @@ FilePickerSessionBase::FilePickerSessionBase(ChromeAppViewAsh* app_view, const base::string16& title, const base::string16& filter, const base::FilePath& default_path) - : app_view_(app_view), + : success_(false), title_(title), filter_(filter), default_path_(default_path), - success_(false) { + app_view_(app_view) { } bool FilePickerSessionBase::DoFilePicker() { diff --git a/win8/metro_driver/ime/text_store.cc b/win8/metro_driver/ime/text_store.cc index eff30b7..6466e9f 100644 --- a/win8/metro_driver/ime/text_store.cc +++ b/win8/metro_driver/ime/text_store.cc @@ -22,7 +22,6 @@ const TsViewCookie kViewCookie = 1; TextStore::TextStore() : text_store_acp_sink_mask_(0), window_handle_(NULL), - delegate_(NULL), committed_size_(0), selection_start_(0), selection_end_(0), @@ -30,7 +29,8 @@ TextStore::TextStore() current_lock_type_(0), category_manager_(NULL), display_attribute_manager_(NULL), - input_scope_(NULL) { + input_scope_(NULL), + delegate_(NULL) { } TextStore::~TextStore() { diff --git a/win8/metro_driver/metro_driver_win7.cc b/win8/metro_driver/metro_driver_win7.cc index 9c4b90d..3ace04c 100644 --- a/win8/metro_driver/metro_driver_win7.cc +++ b/win8/metro_driver/metro_driver_win7.cc @@ -538,8 +538,7 @@ class CoreWindowEmulation public InputHandler { public: CoreWindowEmulation(winapp::Core::IFrameworkView* app_view) - : core_hwnd_(NULL), - mouse_moved_handler_(NULL), + : mouse_moved_handler_(NULL), mouse_capture_lost_handler_(NULL), mouse_pressed_handler_(NULL), mouse_released_handler_(NULL), @@ -549,6 +548,7 @@ class CoreWindowEmulation key_down_handler_(NULL), key_up_handler_(NULL), character_received_handler_(NULL), + core_hwnd_(NULL), app_view_(app_view), window_activated_handler_(NULL) { dispatcher_ = mswr::Make<CoreDispatcherEmulation>(this); |