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

Side by Side Diff: ui/oak/oak_aura_window_display.cc

Issue 9788001: Remove stops_event_propagation from Window, since it's broken. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 9 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 | Annotate | Revision Log
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/oak/oak_aura_window_display.h" 5 #include "ui/oak/oak_aura_window_display.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/string_util.h" 8 #include "base/string_util.h"
9 #include "base/stringprintf.h" 9 #include "base/stringprintf.h"
10 #include "base/utf_string_conversions.h" 10 #include "base/utf_string_conversions.h"
(...skipping 14 matching lines...) Expand all
25 ROW_LAYER, 25 ROW_LAYER,
26 ROW_VISIBLE, 26 ROW_VISIBLE,
27 ROW_BOUNDS, 27 ROW_BOUNDS,
28 ROW_SCREENBOUNDS, 28 ROW_SCREENBOUNDS,
29 ROW_TRANSFORM, 29 ROW_TRANSFORM,
30 ROW_PARENT, 30 ROW_PARENT,
31 ROW_ROOTWINDOW, 31 ROW_ROOTWINDOW,
32 ROW_TRANSIENTCHILDREN, 32 ROW_TRANSIENTCHILDREN,
33 ROW_TRANSIENTPARENT, 33 ROW_TRANSIENTPARENT,
34 ROW_USERDATA, 34 ROW_USERDATA,
35 ROW_STOPSEVENTPROPAGATION,
36 ROW_IGNOREEVENTS, 35 ROW_IGNOREEVENTS,
37 ROW_CANFOCUS, 36 ROW_CANFOCUS,
38 ROW_HITTESTBOUNDSOVERRIDE, 37 ROW_HITTESTBOUNDSOVERRIDE,
39 ROW_COUNT 38 ROW_COUNT
40 }; 39 };
41 40
42 // aura::Window-specific pretty printing. 41 // aura::Window-specific pretty printing.
43 string16 PropertyWithWindowType(int type) { 42 string16 PropertyWithWindowType(int type) {
44 std::string property = "Type: "; 43 std::string property = "Type: ";
45 switch (type) { 44 switch (type) {
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
130 case ROW_ROOTWINDOW: 129 case ROW_ROOTWINDOW:
131 return PropertyWithVoidStar("Root Window: ", window_->GetRootWindow()); 130 return PropertyWithVoidStar("Root Window: ", window_->GetRootWindow());
132 case ROW_TRANSIENTCHILDREN: 131 case ROW_TRANSIENTCHILDREN:
133 return PropertyWithInteger("Transient Children: ", 132 return PropertyWithInteger("Transient Children: ",
134 window_->transient_children().size()); 133 window_->transient_children().size());
135 case ROW_TRANSIENTPARENT: 134 case ROW_TRANSIENTPARENT:
136 return PropertyWithVoidStar("Transient Parent: ", 135 return PropertyWithVoidStar("Transient Parent: ",
137 window_->transient_parent()); 136 window_->transient_parent());
138 case ROW_USERDATA: 137 case ROW_USERDATA:
139 return PropertyWithVoidStar("User Data: ", window_->user_data()); 138 return PropertyWithVoidStar("User Data: ", window_->user_data());
140 case ROW_STOPSEVENTPROPAGATION:
141 return PropertyWithBool("Stops event propagation: ",
142 window_->StopsEventPropagation());
143 case ROW_IGNOREEVENTS: 139 case ROW_IGNOREEVENTS:
144 return PropertyWithBool("Can receive events: ", 140 return PropertyWithBool("Can receive events: ",
145 window_->CanReceiveEvents()); 141 window_->CanReceiveEvents());
146 case ROW_CANFOCUS: 142 case ROW_CANFOCUS:
147 return PropertyWithBool("Can Focus: ", window_->CanFocus()); 143 return PropertyWithBool("Can Focus: ", window_->CanFocus());
148 case ROW_HITTESTBOUNDSOVERRIDE: { 144 case ROW_HITTESTBOUNDSOVERRIDE: {
149 int outer, inner; 145 int outer, inner;
150 window_->GetHitTestBoundsOverride(&outer, &inner); 146 window_->GetHitTestBoundsOverride(&outer, &inner);
151 return ASCIIToUTF16( 147 return ASCIIToUTF16(
152 base::StringPrintf("Hit test bounds override: outer %d, inner %d", 148 base::StringPrintf("Hit test bounds override: outer %d, inner %d",
153 outer, inner)); 149 outer, inner));
154 } 150 }
155 default: 151 default:
156 NOTREACHED(); 152 NOTREACHED();
157 break; 153 break;
158 } 154 }
159 return EmptyString16(); 155 return EmptyString16();
160 } 156 }
161 157
162 void OakAuraWindowDisplay::SetObserver(ui::TableModelObserver* observer) { 158 void OakAuraWindowDisplay::SetObserver(ui::TableModelObserver* observer) {
163 observer_ = observer; 159 observer_ = observer;
164 } 160 }
165 161
166 } // namespace internal 162 } // namespace internal
167 } // namespace oak 163 } // namespace oak
OLDNEW
« chrome/browser/ui/views/ash/chrome_shell_delegate.cc ('K') | « ui/aura/window_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698