ash/display/secondary_display_view.cc - Issue 10905242: add ash_resources.grd and necessary changes to use images in ash/resources

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/display/secondary_display_view.cc

Issue 10905242: add ash_resources.grd and necessary changes to use images in ash/resources (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: don't guard ash_strings with aura=1 Created 8 years, 3 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/display/secondary_display_view.h"	5 #include "ash/display/secondary_display_view.h"

6	6

	7 #include "grit/ash_resources.h"

7 #include "grit/ash_strings.h"	8 #include "grit/ash_strings.h"

8 #include "grit/ui_resources.h"

9 #include "third_party/skia/include/core/SkColor.h"	9 #include "third_party/skia/include/core/SkColor.h"

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

11 #include "ui/base/l10n/l10n_util.h"	11 #include "ui/base/l10n/l10n_util.h"

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

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

14 #include "ui/views/controls/image_view.h"	14 #include "ui/views/controls/image_view.h"

15 #include "ui/views/controls/label.h"	15 #include "ui/views/controls/label.h"

16 #include "ui/views/view.h"	16 #include "ui/views/view.h"

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

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

(...skipping 83 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
102 params.delegate = view;	102 params.delegate = view;

103 params.parent = parent;	103 params.parent = parent;

104 desktop_widget->Init(params);	104 desktop_widget->Init(params);

105 desktop_widget->SetContentsView(view);	105 desktop_widget->SetContentsView(view);

106 desktop_widget->Show();	106 desktop_widget->Show();

107 desktop_widget->GetNativeView()->SetName("SecondaryDisplay");	107 desktop_widget->GetNativeView()->SetName("SecondaryDisplay");

108 return desktop_widget;	108 return desktop_widget;

109 }	109 }

110	110

111 } // namespace ash	111 } // namespace ash

OLD	NEW

« no previous file with comments | « ash/desktop_background/desktop_background_view.cc ('k') | ash/launcher/app_list_button.cc » ('j') | no next file with comments »