Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(891)

Side by Side Diff: win8/metro_driver/metro_driver_win7.cc

Issue 625073003: Replacing the OVERRIDE with override and FINAL with final in win8 folder (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Corrected patchset-1 Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « win8/metro_driver/ime/text_store.h ('k') | win8/viewer/metro_viewer_process_host.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "stdafx.h" 5 #include "stdafx.h"
6 #include <corewindow.h> 6 #include <corewindow.h>
7 #include <shobjidl.h> 7 #include <shobjidl.h>
8 8
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "ui/gfx/geometry/safe_integer_conversions.h" 10 #include "ui/gfx/geometry/safe_integer_conversions.h"
(...skipping 894 matching lines...) Expand 10 before | Expand all | Expand 10 after
905 *hwnd = core_hwnd_; 905 *hwnd = core_hwnd_;
906 return S_OK; 906 return S_OK;
907 } 907 }
908 908
909 virtual HRESULT STDMETHODCALLTYPE put_MessageHandled( 909 virtual HRESULT STDMETHODCALLTYPE put_MessageHandled(
910 boolean value) { 910 boolean value) {
911 return S_OK; 911 return S_OK;
912 } 912 }
913 913
914 // InputHandler 914 // InputHandler
915 virtual bool HandleKeyboardMessage(const MSG& msg) OVERRIDE { 915 virtual bool HandleKeyboardMessage(const MSG& msg) override {
916 switch (msg.message) { 916 switch (msg.message) {
917 case WM_KEYDOWN: 917 case WM_KEYDOWN:
918 case WM_KEYUP: { 918 case WM_KEYUP: {
919 mswr::ComPtr<winui::Core::IKeyEventArgs> event_args; 919 mswr::ComPtr<winui::Core::IKeyEventArgs> event_args;
920 event_args = mswr::Make<KeyEvent>(msg); 920 event_args = mswr::Make<KeyEvent>(msg);
921 KeyEventHandler* handler = NULL; 921 KeyEventHandler* handler = NULL;
922 if (msg.message == WM_KEYDOWN) { 922 if (msg.message == WM_KEYDOWN) {
923 handler = key_down_handler_; 923 handler = key_down_handler_;
924 } else { 924 } else {
925 handler = key_up_handler_; 925 handler = key_up_handler_;
(...skipping 10 matching lines...) Expand all
936 character_received_handler_->Invoke(this, event_args.Get()); 936 character_received_handler_->Invoke(this, event_args.Get());
937 break; 937 break;
938 } 938 }
939 939
940 default: 940 default:
941 return false; 941 return false;
942 } 942 }
943 return true; 943 return true;
944 } 944 }
945 945
946 virtual bool HandleMouseMessage(const MSG& msg) OVERRIDE { 946 virtual bool HandleMouseMessage(const MSG& msg) override {
947 PointerEventHandler* handler = NULL; 947 PointerEventHandler* handler = NULL;
948 mswr::ComPtr<winui::Core::IPointerEventArgs> event_args; 948 mswr::ComPtr<winui::Core::IPointerEventArgs> event_args;
949 event_args = mswr::Make<MouseEvent>(msg); 949 event_args = mswr::Make<MouseEvent>(msg);
950 switch (msg.message) { 950 switch (msg.message) {
951 case WM_MOUSEMOVE: { 951 case WM_MOUSEMOVE: {
952 handler = mouse_moved_handler_; 952 handler = mouse_moved_handler_;
953 break; 953 break;
954 } 954 }
955 case WM_LBUTTONDOWN: { 955 case WM_LBUTTONDOWN: {
956 case WM_RBUTTONDOWN: 956 case WM_RBUTTONDOWN:
(...skipping 271 matching lines...) Expand 10 before | Expand all | Expand 10 after
1228 }; 1228 };
1229 1229
1230 1230
1231 mswr::ComPtr<winapp::Core::ICoreApplication> InitWindows7() { 1231 mswr::ComPtr<winapp::Core::ICoreApplication> InitWindows7() {
1232 HRESULT hr = ::CoInitializeEx(NULL, COINIT_MULTITHREADED); 1232 HRESULT hr = ::CoInitializeEx(NULL, COINIT_MULTITHREADED);
1233 if (FAILED(hr)) 1233 if (FAILED(hr))
1234 CHECK(false); 1234 CHECK(false);
1235 return mswr::Make<CoreApplicationWin7Emulation>(); 1235 return mswr::Make<CoreApplicationWin7Emulation>();
1236 } 1236 }
1237 1237
OLDNEW
« no previous file with comments | « win8/metro_driver/ime/text_store.h ('k') | win8/viewer/metro_viewer_process_host.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698