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

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

Issue 10967036: views: Packaged app window icon should be system/generic icon, if icon is not set by default. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 8 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 | « chrome/browser/ui/views/extensions/shell_window_views.cc ('k') | ui/views/widget/widget.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 "ui/views/widget/native_widget_win.h" 5 #include "ui/views/widget/native_widget_win.h"
6 6
7 #include <dwmapi.h> 7 #include <dwmapi.h>
8 #include <shellapi.h> 8 #include <shellapi.h>
9 9
10 #include <algorithm> 10 #include <algorithm>
(...skipping 920 matching lines...) Expand 10 before | Expand all | Expand 10 after
931 NOTREACHED(); 931 NOTREACHED();
932 } 932 }
933 933
934 message_handler_->set_initial_class_style(class_style); 934 message_handler_->set_initial_class_style(class_style);
935 message_handler_->set_window_style(message_handler_->window_style() | style); 935 message_handler_->set_window_style(message_handler_->window_style() | style);
936 message_handler_->set_window_ex_style( 936 message_handler_->set_window_ex_style(
937 message_handler_->window_ex_style() | ex_style); 937 message_handler_->window_ex_style() | ex_style);
938 938
939 has_non_client_view_ = Widget::RequiresNonClientView(params.type); 939 has_non_client_view_ = Widget::RequiresNonClientView(params.type);
940 message_handler_->set_remove_standard_frame(params.remove_standard_frame); 940 message_handler_->set_remove_standard_frame(params.remove_standard_frame);
941 message_handler_->set_use_system_default_icon(params.use_system_default_icon);
941 } 942 }
942 943
943 //////////////////////////////////////////////////////////////////////////////// 944 ////////////////////////////////////////////////////////////////////////////////
944 // Widget, public: 945 // Widget, public:
945 946
946 // static 947 // static
947 void Widget::NotifyLocaleChanged() { 948 void Widget::NotifyLocaleChanged() {
948 NOTIMPLEMENTED(); 949 NOTIMPLEMENTED();
949 } 950 }
950 951
(...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after
1103 // static 1104 // static
1104 bool NativeWidgetPrivate::IsTouchDown() { 1105 bool NativeWidgetPrivate::IsTouchDown() {
1105 // This currently isn't necessary because we're not generating touch events on 1106 // This currently isn't necessary because we're not generating touch events on
1106 // windows. When we do, this will need to be updated. 1107 // windows. When we do, this will need to be updated.
1107 return false; 1108 return false;
1108 } 1109 }
1109 1110
1110 } // namespace internal 1111 } // namespace internal
1111 1112
1112 } // namespace views 1113 } // namespace views
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/extensions/shell_window_views.cc ('k') | ui/views/widget/widget.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698