chrome/browser/ui/views/extensions/media_gallery_checkbox_view.cc - Issue 498773003: Use a qualified path for chromium_strings, google_chrome_strings, and generated_resources. (part 2 …

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/extensions/media_gallery_checkbox_view.cc

Issue 498773003: Use a qualified path for chromium_strings, google_chrome_strings, and generated_resources. (part 2 … (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

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

« no previous file with comments | « chrome/browser/ui/views/extensions/extension_installed_bubble_view.cc ('k') | chrome/browser/ui/views/find_bar_view.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright 2014 The Chromium Authors. All rights reserved.	1 // Copyright 2014 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/extensions/media_gallery_checkbox_view.h"	5 #include "chrome/browser/ui/views/extensions/media_gallery_checkbox_view.h"

6	6

7 #include "chrome/browser/media_galleries/media_galleries_preferences.h"	7 #include "chrome/browser/media_galleries/media_galleries_preferences.h"

8 #include "grit/generated_resources.h"	8 #include "chrome/grit/generated_resources.h"

9 #include "grit/theme_resources.h"	9 #include "grit/theme_resources.h"

10 #include "third_party/skia/include/core/SkColor.h"	10 #include "third_party/skia/include/core/SkColor.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/gfx/rect.h"	13 #include "ui/gfx/rect.h"

14 #include "ui/views/border.h"	14 #include "ui/views/border.h"

15 #include "ui/views/context_menu_controller.h"	15 #include "ui/views/context_menu_controller.h"

16 #include "ui/views/controls/button/button.h"	16 #include "ui/views/controls/button/button.h"

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

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

(...skipping 94 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
113 if (folder_viewer_button_->visible()) {	113 if (folder_viewer_button_->visible()) {

114 folder_viewer_button_->SetBounds(checkbox_->x() + checkbox_width, area.y(),	114 folder_viewer_button_->SetBounds(checkbox_->x() + checkbox_width, area.y(),

115 folder_viewer_width, area.height());	115 folder_viewer_width, area.height());

116 }	116 }

117 if (secondary_text_->visible()) {	117 if (secondary_text_->visible()) {

118 secondary_text_->SetBounds(	118 secondary_text_->SetBounds(

119 checkbox_->x() + checkbox_width + folder_viewer_width,	119 checkbox_->x() + checkbox_width + folder_viewer_width,

120 area.y(), secondary_text_width, area.height());	120 area.y(), secondary_text_width, area.height());

121 }	121 }

122 }	122 }

OLD	NEW