Rename DesktopMediaPickerModel[Impl]->[Native]DesktopMediaList

chrome/browser/ui/cocoa/media_picker/desktop_media_picker_controller.mm

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import "chrome/browser/ui/cocoa/media_picker/desktop_media_picker_controller.h"
 
 #include "base/bind.h"
 #import "base/mac/bundle_locations.h"
 #include "base/strings/sys_string_conversions.h"
 #import "chrome/browser/ui/cocoa/media_picker/desktop_media_picker_item.h"
@@ skipping 36 matching lines @@
 - (void)reportResult:(content::DesktopMediaID)sourceID;
 
 // Action handlers.
 - (void)okPressed:(id)sender;
 - (void)cancelPressed:(id)sender;
 
 @end
 
 @implementation DesktopMediaPickerController
 
-- (id)initWithModel:(scoped_ptr<DesktopMediaPickerModel>)model
-           callback:(const DesktopMediaPicker::DoneCallback&)callback
-            appName:(const string16&)appName {
+- (id)initWithMediaList:(scoped_ptr<DesktopMediaList>)media_list
+               callback:(const DesktopMediaPicker::DoneCallback&)callback
+                appName:(const string16&)appName {
   const NSUInteger kStyleMask =
       NSTitledWindowMask | NSClosableWindowMask | NSResizableWindowMask;
   base::scoped_nsobject<NSWindow> window(
       [[NSWindow alloc] initWithContentRect:ui::kWindowSizeDeterminedLater
                                   styleMask:kStyleMask
                                     backing:NSBackingStoreBuffered
                                       defer:NO]);
 
   if ((self = [super initWithWindow:window])) {
     [window setDelegate:self];
     [self initializeContentsWithAppName:appName];
-    model_ = model.Pass();
-    model_->SetViewDialogWindowId([window windowNumber]);
+    media_list_ = media_list.Pass();
+    media_list_->SetViewDialogWindowId([window windowNumber]);
     doneCallback_ = callback;
     items_.reset([[NSMutableArray alloc] init]);
     bridge_.reset(new DesktopMediaPickerBridge(self));
   }
   return self;
 }
 
 - (void)dealloc {
   [sourceBrowser_ setDelegate:nil];
   [sourceBrowser_ setDataSource:nil];
@@ skipping 69 matching lines @@
 
   // Resize window to fit.
   [[[self window] contentView] setAutoresizesSubviews:NO];
   [[self window] setContentSize:NSMakeSize(kInitialContentWidth, origin.y)];
   [[self window] setContentMinSize:
       NSMakeSize(kMinimumContentWidth, kMinimumContentHeight)];
   [[[self window] contentView] setAutoresizesSubviews:YES];
 }
 
 - (void)showWindow:(id)sender {
-  // Signal the model to start sending thumbnails. |bridge_| is used as the
+  // Signal the media_list to start sending thumbnails. |bridge_| is used as the
   // observer, and will forward notifications to this object.
-  model_->SetThumbnailSize(gfx::Size(kThumbnailWidth, kThumbnailHeight));
-  model_->StartUpdating(bridge_.get());
+  media_list_->SetThumbnailSize(gfx::Size(kThumbnailWidth, kThumbnailHeight));
+  media_list_->StartUpdating(bridge_.get());
 
   [self.window center];
   [super showWindow:sender];
 }
 
 - (void)reportResult:(content::DesktopMediaID)sourceID {
   if (doneCallback_.is_null()) {
     return;
   }
 
@@ skipping 74 matching lines @@
 }
 
 - (void)imageBrowserSelectionDidChange:(IKImageBrowserView*) aBrowser {
   // Enable or disable the OK button based on whether we have a selection.
   [okButton_ setEnabled:([[sourceBrowser_ selectionIndexes] count] > 0)];
 }
 
 #pragma mark DesktopMediaPickerObserver
 
 - (void)sourceAddedAtIndex:(int)index {
-  const DesktopMediaPickerModel::Source& source = model_->source(index);
+  const DesktopMediaList::Source& source = media_list_->GetSource(index);
   NSString* imageTitle = base::SysUTF16ToNSString(source.name);
   base::scoped_nsobject<DesktopMediaPickerItem> item(
       [[DesktopMediaPickerItem alloc] initWithSourceId:source.id
                                               imageUID:++lastImageUID_
                                             imageTitle:imageTitle]);
   [items_ insertObject:item atIndex:index];
   [sourceBrowser_ reloadData];
 }
 
 - (void)sourceRemovedAtIndex:(int)index {
   if ([[sourceBrowser_ selectionIndexes] containsIndex:index]) {
     // Selected item was removed. Clear selection.
     [sourceBrowser_ setSelectionIndexes:[NSIndexSet indexSet]
                       byExtendingSelection:FALSE];
   }
   [items_ removeObjectAtIndex:index];
   [sourceBrowser_ reloadData];
 }
 
 - (void)sourceNameChangedAtIndex:(int)index {
   DesktopMediaPickerItem* item = [items_ objectAtIndex:index];
-  const DesktopMediaPickerModel::Source& source = model_->source(index);
+  const DesktopMediaList::Source& source = media_list_->GetSource(index);
   [item setImageTitle:base::SysUTF16ToNSString(source.name)];
   [sourceBrowser_ reloadData];
 }
 
 - (void)sourceThumbnailChangedAtIndex:(int)index {
-  const DesktopMediaPickerModel::Source& source = model_->source(index);
+  const DesktopMediaList::Source& source = media_list_->GetSource(index);
   NSImage* image = gfx::NSImageFromImageSkia(source.thumbnail);
 
   DesktopMediaPickerItem* item = [items_ objectAtIndex:index];
   [item setImageRepresentation:image];
   [sourceBrowser_ reloadData];
 }
 
 @end  // @interface DesktopMediaPickerController