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

Side by Side Diff: ui/views/widget/native_widget_aura.cc

Issue 623613004: Revert of Make WindowState::CanMinimize() take into account WidgetDelegate::CanMinimize() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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
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/widget/native_widget_aura.h" 5 #include "ui/views/widget/native_widget_aura.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/strings/string_util.h" 8 #include "base/strings/string_util.h"
9 #include "third_party/skia/include/core/SkRegion.h" 9 #include "third_party/skia/include/core/SkRegion.h"
10 #include "ui/aura/client/aura_constants.h" 10 #include "ui/aura/client/aura_constants.h"
(...skipping 682 matching lines...) Expand 10 before | Expand all | Expand 10 after
693 void NativeWidgetAura::OnRootViewLayout() { 693 void NativeWidgetAura::OnRootViewLayout() {
694 } 694 }
695 695
696 bool NativeWidgetAura::IsTranslucentWindowOpacitySupported() const { 696 bool NativeWidgetAura::IsTranslucentWindowOpacitySupported() const {
697 return true; 697 return true;
698 } 698 }
699 699
700 void NativeWidgetAura::OnSizeConstraintsChanged() { 700 void NativeWidgetAura::OnSizeConstraintsChanged() {
701 window_->SetProperty(aura::client::kCanMaximizeKey, 701 window_->SetProperty(aura::client::kCanMaximizeKey,
702 GetWidget()->widget_delegate()->CanMaximize()); 702 GetWidget()->widget_delegate()->CanMaximize());
703 window_->SetProperty(aura::client::kCanMinimizeKey,
704 GetWidget()->widget_delegate()->CanMinimize());
705 window_->SetProperty(aura::client::kCanResizeKey, 703 window_->SetProperty(aura::client::kCanResizeKey,
706 GetWidget()->widget_delegate()->CanResize()); 704 GetWidget()->widget_delegate()->CanResize());
707 } 705 }
708 706
709 void NativeWidgetAura::RepostNativeEvent(gfx::NativeEvent native_event) { 707 void NativeWidgetAura::RepostNativeEvent(gfx::NativeEvent native_event) {
710 OnEvent(native_event); 708 OnEvent(native_event);
711 } 709 }
712 710
713 //////////////////////////////////////////////////////////////////////////////// 711 ////////////////////////////////////////////////////////////////////////////////
714 // NativeWidgetAura, views::InputMethodDelegate implementation: 712 // NativeWidgetAura, views::InputMethodDelegate implementation:
(...skipping 462 matching lines...) Expand 10 before | Expand all | Expand 10 after
1177 l10n_util::AdjustUIFont(&(ncm.lfCaptionFont)); 1175 l10n_util::AdjustUIFont(&(ncm.lfCaptionFont));
1178 base::win::ScopedHFONT caption_font(CreateFontIndirect(&(ncm.lfCaptionFont))); 1176 base::win::ScopedHFONT caption_font(CreateFontIndirect(&(ncm.lfCaptionFont)));
1179 return gfx::FontList(gfx::Font(caption_font)); 1177 return gfx::FontList(gfx::Font(caption_font));
1180 #else 1178 #else
1181 return gfx::FontList(); 1179 return gfx::FontList();
1182 #endif 1180 #endif
1183 } 1181 }
1184 1182
1185 } // namespace internal 1183 } // namespace internal
1186 } // namespace views 1184 } // namespace views
OLDNEW
« no previous file with comments | « ui/views/widget/desktop_aura/desktop_native_widget_aura.cc ('k') | ui/views/widget/native_widget_aura_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698