| 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 <utility> |
| 8 |
| 7 #include "base/bind.h" | 9 #include "base/bind.h" |
| 8 #include "base/command_line.h" | 10 #include "base/command_line.h" |
| 9 #import "base/mac/bundle_locations.h" | 11 #import "base/mac/bundle_locations.h" |
| 10 #include "base/strings/sys_string_conversions.h" | 12 #include "base/strings/sys_string_conversions.h" |
| 11 #import "chrome/browser/ui/cocoa/key_equivalent_constants.h" | 13 #import "chrome/browser/ui/cocoa/key_equivalent_constants.h" |
| 12 #import "chrome/browser/ui/cocoa/media_picker/desktop_media_picker_item.h" | 14 #import "chrome/browser/ui/cocoa/media_picker/desktop_media_picker_item.h" |
| 13 #include "chrome/common/chrome_switches.h" | 15 #include "chrome/common/chrome_switches.h" |
| 14 #include "chrome/grit/generated_resources.h" | 16 #include "chrome/grit/generated_resources.h" |
| 15 #include "content/public/browser/browser_thread.h" | 17 #include "content/public/browser/browser_thread.h" |
| 16 #include "grit/components_strings.h" | 18 #include "grit/components_strings.h" |
| (...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 68 base::scoped_nsobject<NSWindow> window( | 70 base::scoped_nsobject<NSWindow> window( |
| 69 [[NSWindow alloc] initWithContentRect:ui::kWindowSizeDeterminedLater | 71 [[NSWindow alloc] initWithContentRect:ui::kWindowSizeDeterminedLater |
| 70 styleMask:kStyleMask | 72 styleMask:kStyleMask |
| 71 backing:NSBackingStoreBuffered | 73 backing:NSBackingStoreBuffered |
| 72 defer:NO]); | 74 defer:NO]); |
| 73 | 75 |
| 74 if ((self = [super initWithWindow:window])) { | 76 if ((self = [super initWithWindow:window])) { |
| 75 [parent addChildWindow:window ordered:NSWindowAbove]; | 77 [parent addChildWindow:window ordered:NSWindowAbove]; |
| 76 [window setDelegate:self]; | 78 [window setDelegate:self]; |
| 77 [self initializeContentsWithAppName:appName targetName:targetName]; | 79 [self initializeContentsWithAppName:appName targetName:targetName]; |
| 78 media_list_ = media_list.Pass(); | 80 media_list_ = std::move(media_list); |
| 79 media_list_->SetViewDialogWindowId(content::DesktopMediaID( | 81 media_list_->SetViewDialogWindowId(content::DesktopMediaID( |
| 80 content::DesktopMediaID::TYPE_WINDOW, [window windowNumber])); | 82 content::DesktopMediaID::TYPE_WINDOW, [window windowNumber])); |
| 81 doneCallback_ = callback; | 83 doneCallback_ = callback; |
| 82 items_.reset([[NSMutableArray alloc] init]); | 84 items_.reset([[NSMutableArray alloc] init]); |
| 83 bridge_.reset(new DesktopMediaPickerBridge(self)); | 85 bridge_.reset(new DesktopMediaPickerBridge(self)); |
| 84 } | 86 } |
| 85 return self; | 87 return self; |
| 86 } | 88 } |
| 87 | 89 |
| 88 - (void)dealloc { | 90 - (void)dealloc { |
| (...skipping 244 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 333 - (void)sourceThumbnailChangedAtIndex:(int)index { | 335 - (void)sourceThumbnailChangedAtIndex:(int)index { |
| 334 const DesktopMediaList::Source& source = media_list_->GetSource(index); | 336 const DesktopMediaList::Source& source = media_list_->GetSource(index); |
| 335 NSImage* image = gfx::NSImageFromImageSkia(source.thumbnail); | 337 NSImage* image = gfx::NSImageFromImageSkia(source.thumbnail); |
| 336 | 338 |
| 337 DesktopMediaPickerItem* item = [items_ objectAtIndex:index]; | 339 DesktopMediaPickerItem* item = [items_ objectAtIndex:index]; |
| 338 [item setImageRepresentation:image]; | 340 [item setImageRepresentation:image]; |
| 339 [sourceBrowser_ reloadData]; | 341 [sourceBrowser_ reloadData]; |
| 340 } | 342 } |
| 341 | 343 |
| 342 @end // @interface DesktopMediaPickerController | 344 @end // @interface DesktopMediaPickerController |
| OLD | NEW |