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

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

Issue 137543006: Windows: only change default menu item if available. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: cleaner 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 1484 matching lines...) Expand 10 before | Expand all | Expand 10 after
1495 1495
1496 ScopedRedrawLock lock(this); 1496 ScopedRedrawLock lock(this);
1497 EnableMenuItemByCommand(menu, SC_RESTORE, is_minimized || is_maximized); 1497 EnableMenuItemByCommand(menu, SC_RESTORE, is_minimized || is_maximized);
1498 EnableMenuItemByCommand(menu, SC_MOVE, is_restored); 1498 EnableMenuItemByCommand(menu, SC_MOVE, is_restored);
1499 EnableMenuItemByCommand(menu, SC_SIZE, delegate_->CanResize() && is_restored); 1499 EnableMenuItemByCommand(menu, SC_SIZE, delegate_->CanResize() && is_restored);
1500 EnableMenuItemByCommand(menu, SC_MAXIMIZE, delegate_->CanMaximize() && 1500 EnableMenuItemByCommand(menu, SC_MAXIMIZE, delegate_->CanMaximize() &&
1501 !is_fullscreen && !is_maximized); 1501 !is_fullscreen && !is_maximized);
1502 EnableMenuItemByCommand(menu, SC_MINIMIZE, delegate_->CanMaximize() && 1502 EnableMenuItemByCommand(menu, SC_MINIMIZE, delegate_->CanMaximize() &&
1503 !is_minimized); 1503 !is_minimized);
1504 1504
1505 ::SetMenuDefaultItem(menu, is_maximized ? SC_RESTORE : SC_MAXIMIZE, FALSE); 1505 if (is_maximized)
1506 ::SetMenuDefaultItem(menu, SC_RESTORE, FALSE);
1507 else if (delegate_->CanMaximize())
1508 ::SetMenuDefaultItem(menu, SC_MAXIMIZE, FALSE);
1506 } 1509 }
1507 1510
1508 void HWNDMessageHandler::OnInputLangChange(DWORD character_set, 1511 void HWNDMessageHandler::OnInputLangChange(DWORD character_set,
1509 HKL input_language_id) { 1512 HKL input_language_id) {
1510 delegate_->HandleInputLanguageChange(character_set, input_language_id); 1513 delegate_->HandleInputLanguageChange(character_set, input_language_id);
1511 } 1514 }
1512 1515
1513 LRESULT HWNDMessageHandler::OnKeyEvent(UINT message, 1516 LRESULT HWNDMessageHandler::OnKeyEvent(UINT message,
1514 WPARAM w_param, 1517 WPARAM w_param,
1515 LPARAM l_param) { 1518 LPARAM l_param) {
(...skipping 799 matching lines...) Expand 10 before | Expand all | Expand 10 after
2315 SetMsgHandled(FALSE); 2318 SetMsgHandled(FALSE);
2316 } 2319 }
2317 2320
2318 void HWNDMessageHandler::HandleTouchEvents(const TouchEvents& touch_events) { 2321 void HWNDMessageHandler::HandleTouchEvents(const TouchEvents& touch_events) {
2319 base::WeakPtr<HWNDMessageHandler> ref(weak_factory_.GetWeakPtr()); 2322 base::WeakPtr<HWNDMessageHandler> ref(weak_factory_.GetWeakPtr());
2320 for (size_t i = 0; i < touch_events.size() && ref; ++i) 2323 for (size_t i = 0; i < touch_events.size() && ref; ++i)
2321 delegate_->HandleTouchEvent(touch_events[i]); 2324 delegate_->HandleTouchEvent(touch_events[i]);
2322 } 2325 }
2323 2326
2324 } // namespace views 2327 } // 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