chrome/browser/ui/cocoa/media_picker/desktop_media_picker_controller.mm - 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/cocoa/media_picker/desktop_media_picker_controller.mm

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/cocoa/location_bar/zoom_decoration.mm ('k') | chrome/browser/ui/cocoa/notifications/message_center_tray_bridge.mm » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 #import "chrome/browser/ui/cocoa/media_picker/desktop_media_picker_controller.h"	5 #import "chrome/browser/ui/cocoa/media_picker/desktop_media_picker_controller.h"

6	6

7 #include "base/bind.h"	7 #include "base/bind.h"

8 #import "base/mac/bundle_locations.h"	8 #import "base/mac/bundle_locations.h"

9 #include "base/strings/sys_string_conversions.h"	9 #include "base/strings/sys_string_conversions.h"

10 #import "chrome/browser/ui/cocoa/media_picker/desktop_media_picker_item.h"	10 #import "chrome/browser/ui/cocoa/media_picker/desktop_media_picker_item.h"

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

11 #include "content/public/browser/browser_thread.h"	12 #include "content/public/browser/browser_thread.h"

12 #include "grit/generated_resources.h"

13 #import "third_party/google_toolbox_for_mac/src/AppKit/GTMUILocalizerAndLayoutTw eaker.h"	13 #import "third_party/google_toolbox_for_mac/src/AppKit/GTMUILocalizerAndLayoutTw eaker.h"

14 #import "ui/base/cocoa/flipped_view.h"	14 #import "ui/base/cocoa/flipped_view.h"

15 #import "ui/base/cocoa/window_size_constants.h"	15 #import "ui/base/cocoa/window_size_constants.h"

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

17 #include "ui/gfx/image/image_skia_util_mac.h"	17 #include "ui/gfx/image/image_skia_util_mac.h"

18	18

19 namespace {	19 namespace {

20	20

21 const int kInitialContentWidth = 620;	21 const int kInitialContentWidth = 620;

22 const int kMinimumContentWidth = 500;	22 const int kMinimumContentWidth = 500;

(...skipping 290 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
313 - (void)sourceThumbnailChangedAtIndex:(int)index {	313 - (void)sourceThumbnailChangedAtIndex:(int)index {

314 const DesktopMediaList::Source& source = media_list_->GetSource(index);	314 const DesktopMediaList::Source& source = media_list_->GetSource(index);

315 NSImage* image = gfx::NSImageFromImageSkia(source.thumbnail);	315 NSImage* image = gfx::NSImageFromImageSkia(source.thumbnail);

316	316

317 DesktopMediaPickerItem* item = [items_ objectAtIndex:index];	317 DesktopMediaPickerItem* item = [items_ objectAtIndex:index];

318 [item setImageRepresentation:image];	318 [item setImageRepresentation:image];

319 [sourceBrowser_ reloadData];	319 [sourceBrowser_ reloadData];

320 }	320 }

321	321

322 @end // @interface DesktopMediaPickerController	322 @end // @interface DesktopMediaPickerController

OLD	NEW