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

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

Issue 8650001: Move ChromeOS bubble setup code to window.cc. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 1 month 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') | no next file » | 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 "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/widget/widget.h" 8 #include "ui/views/widget/widget.h"
8 9
9 #if defined(OS_CHROMEOS) && defined(TOOLKIT_USES_GTK) 10 #if defined(OS_CHROMEOS) && defined(TOOLKIT_USES_GTK)
10 #include "chrome/browser/chromeos/frame/bubble_window.h" 11 #include "chrome/browser/chromeos/frame/bubble_window.h"
11 #endif // defined(OS_CHROMEOS) 12 #include "chrome/browser/chromeos/legacy_window_manager/wm_ipc.h"
13 #include "third_party/cros_system_api/window_manager/chromeos_wm_ipc_enums.h"
14 #endif
12 15
13 namespace browser { 16 namespace browser {
14 17
15 views::Widget* CreateViewsWindow(gfx::NativeWindow parent, 18 views::Widget* CreateViewsWindow(gfx::NativeWindow parent,
16 views::WidgetDelegate* delegate) { 19 views::WidgetDelegate* delegate) {
17 #if defined(OS_CHROMEOS) && defined(TOOLKIT_USES_GTK) 20 #if defined(OS_CHROMEOS) && defined(TOOLKIT_USES_GTK)
18 // TODO(msw): revert to BubbleWindow for all ChromeOS cases when CL 21 // TODO(msw): revert to BubbleWindow for all ChromeOS cases when CL
19 // for crbug.com/98322 is landed. 22 // for crbug.com/98322 is landed.
20 return chromeos::BubbleWindow::Create(parent, 23 return chromeos::BubbleWindow::Create(parent,
21 STYLE_GENERIC, delegate); 24 STYLE_GENERIC, delegate);
22 #else 25 #else
23 return views::Widget::CreateWindowWithParent(delegate, parent); 26 return views::Widget::CreateWindowWithParent(delegate, parent);
24 #endif 27 #endif
25 } 28 }
26 29
30 views::Widget* CreateViewsBubble(views::BubbleDelegateView* delegate) {
31 views::Widget* bubble_widget =
32 views::BubbleDelegateView::CreateBubble(delegate);
33 #if defined(OS_CHROMEOS) && defined(TOOLKIT_USES_GTK)
34 {
35 std::vector<int> params;
36 params.push_back(0); // Do not show when screen is locked.
37 chromeos::WmIpc::instance()->SetWindowType(
38 bubble_widget->GetNativeView(),
39 chromeos::WM_IPC_WINDOW_CHROME_INFO_BUBBLE,
40 &params);
41 }
42 #endif
43 return bubble_widget;
44 }
45
46 views::Widget* CreateViewsBubbleAboveLockScreen(
47 views::BubbleDelegateView* delegate) {
48 views::Widget* bubble_widget =
49 views::BubbleDelegateView::CreateBubble(delegate);
50 #if defined(OS_CHROMEOS) && defined(TOOLKIT_USES_GTK)
51 std::vector<int> params;
52 params.push_back(1); // Show while screen is locked.
53 chromeos::WmIpc::instance()->SetWindowType(
54 bubble_widget->GetNativeView(),
55 chromeos::WM_IPC_WINDOW_CHROME_INFO_BUBBLE,
56 &params);
57 #endif
58 return bubble_widget;
59 }
60
27 } // namespace browser 61 } // namespace browser
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/window.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698