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

Side by Side Diff: ui/views/widget/widget.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: update the patch according Scott's comment. 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
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/widget.h" 5 #include "ui/views/widget/widget.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/message_loop.h" 8 #include "base/message_loop.h"
9 #include "base/utf_string_conversions.h" 9 #include "base/utf_string_conversions.h"
10 #include "ui/base/events/event.h" 10 #include "ui/base/events/event.h"
(...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after
143 transient(false), 143 transient(false),
144 transparent(ViewsDelegate::views_delegate && 144 transparent(ViewsDelegate::views_delegate &&
145 ViewsDelegate::views_delegate->UseTransparentWindows()), 145 ViewsDelegate::views_delegate->UseTransparentWindows()),
146 accept_events(true), 146 accept_events(true),
147 can_activate(true), 147 can_activate(true),
148 keep_on_top(false), 148 keep_on_top(false),
149 ownership(NATIVE_WIDGET_OWNS_WIDGET), 149 ownership(NATIVE_WIDGET_OWNS_WIDGET),
150 mirror_origin_in_rtl(false), 150 mirror_origin_in_rtl(false),
151 has_dropshadow(false), 151 has_dropshadow(false),
152 remove_standard_frame(false), 152 remove_standard_frame(false),
153 use_system_default_icon(false),
153 show_state(ui::SHOW_STATE_DEFAULT), 154 show_state(ui::SHOW_STATE_DEFAULT),
154 double_buffer(false), 155 double_buffer(false),
155 parent(NULL), 156 parent(NULL),
156 parent_widget(NULL), 157 parent_widget(NULL),
157 native_widget(NULL), 158 native_widget(NULL),
158 top_level(false), 159 top_level(false),
159 layer_type(ui::LAYER_TEXTURED) { 160 layer_type(ui::LAYER_TEXTURED) {
160 } 161 }
161 162
162 Widget::InitParams::InitParams(Type type) 163 Widget::InitParams::InitParams(Type type)
(...skipping 1180 matching lines...) Expand 10 before | Expand all | Expand 10 after
1343 1344
1344 //////////////////////////////////////////////////////////////////////////////// 1345 ////////////////////////////////////////////////////////////////////////////////
1345 // internal::NativeWidgetPrivate, NativeWidget implementation: 1346 // internal::NativeWidgetPrivate, NativeWidget implementation:
1346 1347
1347 internal::NativeWidgetPrivate* NativeWidgetPrivate::AsNativeWidgetPrivate() { 1348 internal::NativeWidgetPrivate* NativeWidgetPrivate::AsNativeWidgetPrivate() {
1348 return this; 1349 return this;
1349 } 1350 }
1350 1351
1351 } // namespace internal 1352 } // namespace internal
1352 } // namespace views 1353 } // namespace views
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698