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

Side by Side Diff: ui/views/win/hwnd_message_handler.cc

Issue 113943005: Set the default action on the title bar menu properly on Windows. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 11 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 | « no previous file | no next file » | 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 "ui/views/win/hwnd_message_handler.h" 5 #include "ui/views/win/hwnd_message_handler.h"
6 6
7 #include <dwmapi.h> 7 #include <dwmapi.h>
8 #include <shellapi.h> 8 #include <shellapi.h>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 1435 matching lines...) Expand 10 before | Expand all | Expand 10 after
1446 bool is_restored = !is_fullscreen && !is_minimized && !is_maximized; 1446 bool is_restored = !is_fullscreen && !is_minimized && !is_maximized;
1447 1447
1448 ScopedRedrawLock lock(this); 1448 ScopedRedrawLock lock(this);
1449 EnableMenuItemByCommand(menu, SC_RESTORE, is_minimized || is_maximized); 1449 EnableMenuItemByCommand(menu, SC_RESTORE, is_minimized || is_maximized);
1450 EnableMenuItemByCommand(menu, SC_MOVE, is_restored); 1450 EnableMenuItemByCommand(menu, SC_MOVE, is_restored);
1451 EnableMenuItemByCommand(menu, SC_SIZE, delegate_->CanResize() && is_restored); 1451 EnableMenuItemByCommand(menu, SC_SIZE, delegate_->CanResize() && is_restored);
1452 EnableMenuItemByCommand(menu, SC_MAXIMIZE, delegate_->CanMaximize() && 1452 EnableMenuItemByCommand(menu, SC_MAXIMIZE, delegate_->CanMaximize() &&
1453 !is_fullscreen && !is_maximized); 1453 !is_fullscreen && !is_maximized);
1454 EnableMenuItemByCommand(menu, SC_MINIMIZE, delegate_->CanMaximize() && 1454 EnableMenuItemByCommand(menu, SC_MINIMIZE, delegate_->CanMaximize() &&
1455 !is_minimized); 1455 !is_minimized);
1456
1457 ::SetMenuDefaultItem(menu, is_maximized ? SC_RESTORE : SC_MAXIMIZE, FALSE);
1456 } 1458 }
1457 1459
1458 void HWNDMessageHandler::OnInputLangChange(DWORD character_set, 1460 void HWNDMessageHandler::OnInputLangChange(DWORD character_set,
1459 HKL input_language_id) { 1461 HKL input_language_id) {
1460 delegate_->HandleInputLanguageChange(character_set, input_language_id); 1462 delegate_->HandleInputLanguageChange(character_set, input_language_id);
1461 } 1463 }
1462 1464
1463 LRESULT HWNDMessageHandler::OnKeyEvent(UINT message, 1465 LRESULT HWNDMessageHandler::OnKeyEvent(UINT message,
1464 WPARAM w_param, 1466 WPARAM w_param,
1465 LPARAM l_param) { 1467 LPARAM l_param) {
(...skipping 775 matching lines...) Expand 10 before | Expand all | Expand 10 after
2241 SetMsgHandled(FALSE); 2243 SetMsgHandled(FALSE);
2242 } 2244 }
2243 2245
2244 void HWNDMessageHandler::HandleTouchEvents(const TouchEvents& touch_events) { 2246 void HWNDMessageHandler::HandleTouchEvents(const TouchEvents& touch_events) {
2245 base::WeakPtr<HWNDMessageHandler> ref(weak_factory_.GetWeakPtr()); 2247 base::WeakPtr<HWNDMessageHandler> ref(weak_factory_.GetWeakPtr());
2246 for (size_t i = 0; i < touch_events.size() && ref; ++i) 2248 for (size_t i = 0; i < touch_events.size() && ref; ++i)
2247 delegate_->HandleTouchEvent(touch_events[i]); 2249 delegate_->HandleTouchEvent(touch_events[i]);
2248 } 2250 }
2249 2251
2250 } // namespace views 2252 } // namespace views
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698