ash/shell/widgets.cc - Issue 15735027: Use a direct include of utf_string_conversions.h in android_webview/, apps/, ash/, base/.

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: ash/shell/widgets.cc

Issue 15735027: Use a direct include of utf_string_conversions.h in android_webview/, apps/, ash/, base/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 years, 6 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

OLD	NEW
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 "ash/shell.h"	5 #include "ash/shell.h"

6 #include "base/utf_string_conversions.h" // ASCIIToUTF16	6 #include "base/strings/utf_string_conversions.h" // ASCIIToUTF16

7 #include "ui/aura/root_window.h"	7 #include "ui/aura/root_window.h"

8 #include "ui/aura/window.h"	8 #include "ui/aura/window.h"

9 #include "ui/gfx/canvas.h"	9 #include "ui/gfx/canvas.h"

10 #include "ui/views/controls/button/checkbox.h"	10 #include "ui/views/controls/button/checkbox.h"

11 #include "ui/views/controls/button/label_button.h"	11 #include "ui/views/controls/button/label_button.h"

12 #include "ui/views/controls/button/radio_button.h"	12 #include "ui/views/controls/button/radio_button.h"

13 #include "ui/views/widget/widget.h"	13 #include "ui/views/widget/widget.h"

14 #include "ui/views/widget/widget_delegate.h"	14 #include "ui/views/widget/widget_delegate.h"

15	15

16 namespace {	16 namespace {

(...skipping 119 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
136 gfx::Rect bounds(kWindowLeft, kWindowTop, kWindowWidth, kWindowHeight);	136 gfx::Rect bounds(kWindowLeft, kWindowTop, kWindowWidth, kWindowHeight);

137 views::Widget* widget =	137 views::Widget* widget =

138 views::Widget::CreateWindowWithContextAndBounds(	138 views::Widget::CreateWindowWithContextAndBounds(

139 new WidgetsWindow, Shell::GetPrimaryRootWindow(), bounds);	139 new WidgetsWindow, Shell::GetPrimaryRootWindow(), bounds);

140 widget->GetNativeView()->SetName("WidgetsWindow");	140 widget->GetNativeView()->SetName("WidgetsWindow");

141 widget->Show();	141 widget->Show();

142 }	142 }

143	143

144 } // namespace shell	144 } // namespace shell

145 } // namespace ash	145 } // namespace ash

OLD	NEW

« no previous file with comments | « ash/shell/toplevel_window.cc ('k') | ash/shell/window_type_launcher.cc » ('j') | no next file with comments »