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

Side by Side Diff: chrome/browser/ui/views/window.cc

Issue 9250029: Enable KeyboardOverlayDialog on aura. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix the alignment nit. Created 8 years, 10 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 | « chrome/browser/ui/views/window.h ('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 "chrome/browser/ui/views/window.h" 5 #include "chrome/browser/ui/views/window.h"
6 6
7 #include "ui/views/bubble/bubble_delegate.h" 7 #include "ui/views/bubble/bubble_delegate.h"
8 #include "ui/views/widget/widget.h" 8 #include "ui/views/widget/widget.h"
9 9
10 #if defined(USE_AURA) 10 #if defined(USE_AURA)
(...skipping 27 matching lines...) Expand all
38 views::Widget* CreateViewsWindow(gfx::NativeWindow parent, 38 views::Widget* CreateViewsWindow(gfx::NativeWindow parent,
39 views::WidgetDelegate* delegate, 39 views::WidgetDelegate* delegate,
40 DialogStyle style) { 40 DialogStyle style) {
41 #if defined(OS_CHROMEOS) && !defined(USE_AURA) 41 #if defined(OS_CHROMEOS) && !defined(USE_AURA)
42 return chromeos::BubbleWindow::Create(parent, style, delegate); 42 return chromeos::BubbleWindow::Create(parent, style, delegate);
43 #else 43 #else
44 return views::Widget::CreateWindowWithParent(delegate, parent); 44 return views::Widget::CreateWindowWithParent(delegate, parent);
45 #endif 45 #endif
46 } 46 }
47 47
48 views::Widget* CreateFramelessViewsWindow(gfx::NativeWindow parent,
49 views::WidgetDelegate* delegate) {
50 #if defined(OS_CHROMEOS) && !defined(USE_AURA)
51 return chromeos::BubbleWindow::Create(parent, STYLE_FLUSH, delegate);
52 #else
53 return CreateFramelessWindowWithParentAndBounds(delegate,
54 parent, gfx::Rect());
55 #endif
56 }
57
58 views::Widget* CreateFramelessWindowWithParentAndBounds(
59 views::WidgetDelegate* delegate,
60 gfx::NativeWindow parent,
61 const gfx::Rect& bounds) {
62 views::Widget* widget = new views::Widget;
63 views::Widget::InitParams params(
64 views::Widget::InitParams::TYPE_WINDOW_FRAMELESS);
65 params.delegate = delegate;
66 // Will this function be called if !defined(USE_AURA)?
67 #if defined(OS_WIN) || defined(USE_AURA)
68 params.parent = parent;
69 #endif
70 params.bounds = bounds;
71 widget->Init(params);
72 return widget;
73 }
74
48 views::Widget* CreateViewsBubble(views::BubbleDelegateView* delegate) { 75 views::Widget* CreateViewsBubble(views::BubbleDelegateView* delegate) {
49 views::Widget* bubble_widget = 76 views::Widget* bubble_widget =
50 views::BubbleDelegateView::CreateBubble(delegate); 77 views::BubbleDelegateView::CreateBubble(delegate);
51 #if defined(OS_CHROMEOS) && defined(TOOLKIT_USES_GTK) 78 #if defined(OS_CHROMEOS) && defined(TOOLKIT_USES_GTK)
52 { 79 {
53 std::vector<int> params; 80 std::vector<int> params;
54 params.push_back(0); // Do not show when screen is locked. 81 params.push_back(0); // Do not show when screen is locked.
55 chromeos::WmIpc::instance()->SetWindowType( 82 chromeos::WmIpc::instance()->SetWindowType(
56 bubble_widget->GetNativeView(), 83 bubble_widget->GetNativeView(),
57 chromeos::WM_IPC_WINDOW_CHROME_INFO_BUBBLE, 84 chromeos::WM_IPC_WINDOW_CHROME_INFO_BUBBLE,
(...skipping 17 matching lines...) Expand all
75 params.push_back(1); // Show while screen is locked. 102 params.push_back(1); // Show while screen is locked.
76 chromeos::WmIpc::instance()->SetWindowType( 103 chromeos::WmIpc::instance()->SetWindowType(
77 bubble_widget->GetNativeView(), 104 bubble_widget->GetNativeView(),
78 chromeos::WM_IPC_WINDOW_CHROME_INFO_BUBBLE, 105 chromeos::WM_IPC_WINDOW_CHROME_INFO_BUBBLE,
79 &params); 106 &params);
80 #endif 107 #endif
81 return bubble_widget; 108 return bubble_widget;
82 } 109 }
83 110
84 } // namespace browser 111 } // namespace browser
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/window.h ('k') | ui/views/widget/widget.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698