ui/app_list/views/speech_view.cc - Issue 480693002: Use a qualified path for ui_resources.h grit includes.

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/app_list/views/speech_view.cc

Issue 480693002: Use a qualified path for ui_resources.h grit includes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

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

« ash/DEPS ('K') | « ui/app_list/views/search_box_view.cc ('k') | ui/base/DEPS » ('j') | no next file with comments »

OLD	NEW
1 // Copyright 2013 The Chromium Authors. All rights reserved.	1 // Copyright 2013 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 "ui/app_list/views/speech_view.h"	5 #include "ui/app_list/views/speech_view.h"

6	6

7 #include "base/strings/utf_string_conversions.h"	7 #include "base/strings/utf_string_conversions.h"

8 #include "grit/ui_resources.h"

9 #include "grit/ui_strings.h"	8 #include "grit/ui_strings.h"

10 #include "third_party/skia/include/core/SkPath.h"	9 #include "third_party/skia/include/core/SkPath.h"

11 #include "ui/app_list/app_list_model.h"	10 #include "ui/app_list/app_list_model.h"

12 #include "ui/app_list/app_list_view_delegate.h"	11 #include "ui/app_list/app_list_view_delegate.h"

13 #include "ui/app_list/speech_ui_model.h"	12 #include "ui/app_list/speech_ui_model.h"

14 #include "ui/base/l10n/l10n_util.h"	13 #include "ui/base/l10n/l10n_util.h"

15 #include "ui/base/resource/resource_bundle.h"	14 #include "ui/base/resource/resource_bundle.h"

16 #include "ui/gfx/canvas.h"	15 #include "ui/gfx/canvas.h"

17 #include "ui/gfx/path.h"	16 #include "ui/gfx/path.h"

	17 #include "ui/resources/grit/ui_resources.h"

18 #include "ui/views/animation/bounds_animator.h"	18 #include "ui/views/animation/bounds_animator.h"

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

20 #include "ui/views/controls/button/image_button.h"	20 #include "ui/views/controls/button/image_button.h"

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

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

23 #include "ui/views/layout/fill_layout.h"	23 #include "ui/views/layout/fill_layout.h"

24 #include "ui/views/masked_targeter_delegate.h"	24 #include "ui/views/masked_targeter_delegate.h"

25 #include "ui/views/shadow_border.h"	25 #include "ui/views/shadow_border.h"

26	26

27 namespace app_list {	27 namespace app_list {

(...skipping 217 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
245 }	245 }

246 speech_result_->SetText(l10n_util::GetStringUTF16(text_resource_id));	246 speech_result_->SetText(l10n_util::GetStringUTF16(text_resource_id));

247 speech_result_->SetEnabledColor(kHintTextColor);	247 speech_result_->SetEnabledColor(kHintTextColor);

248	248

249 ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();	249 ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();

250 mic_button_->SetImage(views::Button::STATE_NORMAL,	250 mic_button_->SetImage(views::Button::STATE_NORMAL,

251 bundle.GetImageSkiaNamed(resource_id));	251 bundle.GetImageSkiaNamed(resource_id));

252 }	252 }

253	253

254 } // namespace app_list	254 } // namespace app_list

OLD	NEW