chrome/browser/ui/views/window.cc - Issue 8469006: Promote bubble_window_style to more general dialog_style.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 8469006: Promote bubble_window_style to more general dialog_style. (Closed) Base URL: /usr/local/google/home/bshe/NoTouchChromium/../TouchChromium/src/@trunk

Patch Set: Change base url and merge trunk. 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

« no previous file with comments | « chrome/browser/ui/views/keyboard_overlay_dialog_view.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

OLD	NEW
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 "views/widget/widget.h"	7 #include "views/widget/widget.h"

8	8

9 #if defined(OS_CHROMEOS) && defined(TOOLKIT_USES_GTK)	9 #if defined(OS_CHROMEOS) && defined(TOOLKIT_USES_GTK)

10 #include "chrome/browser/chromeos/frame/bubble_window.h"	10 #include "chrome/browser/chromeos/frame/bubble_window.h"

11 #endif // defined(OS_CHROMEOS)	11 #endif // defined(OS_CHROMEOS)

12	12

13 namespace browser {	13 namespace browser {

14	14

15 views::Widget* CreateViewsWindow(gfx::NativeWindow parent,	15 views::Widget* CreateViewsWindow(gfx::NativeWindow parent,

16 views::WidgetDelegate* delegate) {	16 views::WidgetDelegate* delegate) {

17 #if defined(OS_CHROMEOS) && defined(TOOLKIT_USES_GTK)	17 #if defined(OS_CHROMEOS) && defined(TOOLKIT_USES_GTK)

18 // TODO(msw): revert to BubbleWindow for all ChromeOS cases when CL	18 // TODO(msw): revert to BubbleWindow for all ChromeOS cases when CL

19 // for crbug.com/98322 is landed.	19 // for crbug.com/98322 is landed.

20 return chromeos::BubbleWindow::Create(parent,	20 return chromeos::BubbleWindow::Create(parent,

21 chromeos::STYLE_GENERIC, delegate);	21 STYLE_GENERIC, delegate);

22 #else	22 #else

23 return views::Widget::CreateWindowWithParent(delegate, parent);	23 return views::Widget::CreateWindowWithParent(delegate, parent);

24 #endif	24 #endif

25 }	25 }

26	26

27 } // namespace browser	27 } // namespace browser

OLD	NEW