ui/views/desktop/desktop_main.cc - Issue 8568022: views: Move desktop and touchui directories to ui/views/.

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: ui/views/desktop/desktop_main.cc

Issue 8568022: views: Move desktop and touchui directories to ui/views/. (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

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 "base/at_exit.h"	5 #include "base/at_exit.h"

6 #include "base/command_line.h"	6 #include "base/command_line.h"

7 #include "base/i18n/icu_util.h"	7 #include "base/i18n/icu_util.h"

8 #include "base/process_util.h"	8 #include "base/process_util.h"

9 #include "base/utf_string_conversions.h"	9 #include "base/utf_string_conversions.h"

10 #include "ui/base/resource/resource_bundle.h"	10 #include "ui/base/resource/resource_bundle.h"

11 #include "ui/base/ui_base_paths.h"	11 #include "ui/base/ui_base_paths.h"

12 #include "views/desktop/desktop_views_delegate.h"	12 #include "ui/views/desktop/desktop_views_delegate.h"

13 #include "views/desktop/desktop_window_view.h"	13 #include "ui/views/desktop/desktop_window_view.h"

14 #include "views/focus/accelerator_handler.h"	14 #include "views/focus/accelerator_handler.h"

15 #include "views/widget/widget.h"	15 #include "views/widget/widget.h"

16	16

17 #if defined(OS_WIN)	17 #if defined(OS_WIN)

18 #include <ole2.h>	18 #include <ole2.h>

19 #endif	19 #endif

20	20

21 #if defined(USE_WAYLAND)	21 #if defined(USE_WAYLAND)

22 #include "ui/gfx/gl/gl_surface_egl.h"	22 #include "ui/gfx/gl/gl_surface_egl.h"

23 #include "ui/wayland/wayland_display.h"	23 #include "ui/wayland/wayland_display.h"

(...skipping 57 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
81 gfx::Rect(600, 450, 450, 300), false);	81 gfx::Rect(600, 450, 450, 300), false);

82	82

83 views::AcceleratorHandler accelerator_handler;	83 views::AcceleratorHandler accelerator_handler;

84 MessageLoopForUI::current()->RunWithDispatcher(&accelerator_handler);	84 MessageLoopForUI::current()->RunWithDispatcher(&accelerator_handler);

85	85

86 #if defined(OS_WIN)	86 #if defined(OS_WIN)

87 OleUninitialize();	87 OleUninitialize();

88 #endif	88 #endif

89 return 0;	89 return 0;

90 }	90 }

OLD	NEW

« no previous file with comments | « ui/views/desktop/desktop_background.cc ('k') | ui/views/desktop/desktop_views_delegate.h » ('j') | no next file with comments »