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

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

Issue 9027020: Bypass ToplevelWindowEventFilter for panels. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge/sync Created 8 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 | Annotate | Revision Log
« no previous file with comments | « ui/views/view.h ('k') | ui/views/widget/native_widget_gtk.cc » ('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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/string_util.h" 8 #include "base/string_util.h"
9 #include "ui/aura/client/activation_client.h" 9 #include "ui/aura/client/activation_client.h"
10 #include "ui/aura/client/aura_constants.h" 10 #include "ui/aura/client/aura_constants.h"
(...skipping 23 matching lines...) Expand all
34 34
35 namespace views { 35 namespace views {
36 36
37 namespace { 37 namespace {
38 38
39 aura::client::WindowType GetAuraWindowTypeForWidgetType( 39 aura::client::WindowType GetAuraWindowTypeForWidgetType(
40 Widget::InitParams::Type type) { 40 Widget::InitParams::Type type) {
41 switch (type) { 41 switch (type) {
42 case Widget::InitParams::TYPE_WINDOW: 42 case Widget::InitParams::TYPE_WINDOW:
43 return aura::client::WINDOW_TYPE_NORMAL; 43 return aura::client::WINDOW_TYPE_NORMAL;
44 case Widget::InitParams::TYPE_PANEL:
45 return aura::client::WINDOW_TYPE_PANEL;
44 case Widget::InitParams::TYPE_WINDOW_FRAMELESS: 46 case Widget::InitParams::TYPE_WINDOW_FRAMELESS:
45 case Widget::InitParams::TYPE_CONTROL: 47 case Widget::InitParams::TYPE_CONTROL:
46 case Widget::InitParams::TYPE_POPUP: 48 case Widget::InitParams::TYPE_POPUP:
47 case Widget::InitParams::TYPE_BUBBLE: 49 case Widget::InitParams::TYPE_BUBBLE:
48 return aura::client::WINDOW_TYPE_POPUP; 50 return aura::client::WINDOW_TYPE_POPUP;
49 case Widget::InitParams::TYPE_MENU: 51 case Widget::InitParams::TYPE_MENU:
50 return aura::client::WINDOW_TYPE_MENU; 52 return aura::client::WINDOW_TYPE_MENU;
51 case Widget::InitParams::TYPE_TOOLTIP: 53 case Widget::InitParams::TYPE_TOOLTIP:
52 return aura::client::WINDOW_TYPE_TOOLTIP; 54 return aura::client::WINDOW_TYPE_TOOLTIP;
53 default: 55 default:
(...skipping 806 matching lines...) Expand 10 before | Expand all | Expand 10 after
860 } 862 }
861 } 863 }
862 864
863 // static 865 // static
864 bool NativeWidgetPrivate::IsMouseButtonDown() { 866 bool NativeWidgetPrivate::IsMouseButtonDown() {
865 return aura::RootWindow::GetInstance()->IsMouseButtonDown(); 867 return aura::RootWindow::GetInstance()->IsMouseButtonDown();
866 } 868 }
867 869
868 } // namespace internal 870 } // namespace internal
869 } // namespace views 871 } // namespace views
OLDNEW
« no previous file with comments | « ui/views/view.h ('k') | ui/views/widget/native_widget_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698