Rename the remaining usage of Monitor to Display

ash/display/secondary_display_view.cc

 // Copyright (c) 2012 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.
 
-#include "ash/monitor/secondary_monitor_view.h"
+#include "ash/display/secondary_display_view.h"
 
 #include "grit/ash_strings.h"
 #include "grit/ui_resources.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/aura/window.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/views/background.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_delegate.h"
 
 namespace ash {
 namespace {
 
 // Colors for the background, the message text and the shortcut text.
 const SkColor kBackgroundColor = SkColorSetRGB(0x33, 0x33, 0x33);
 const SkColor kTextColor = SkColorSetRGB(127, 127, 127);
 
-// A view to be displayed on secondary monitor.
-class SecondaryMonitorView : public views::WidgetDelegateView {
+// A view to be displayed on secondary display.
+class SecondaryDisplayView : public views::WidgetDelegateView {
  public:
-  SecondaryMonitorView() {
+  SecondaryDisplayView() {
     Init();
   }
-  virtual ~SecondaryMonitorView() {
+  virtual ~SecondaryDisplayView() {
   }
 
   void Init() {
     ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
 
     set_background(views::Background::CreateSolidBackground(kBackgroundColor));
     message_ = new views::Label(
         l10n_util::GetStringUTF16(IDS_ASH_SECONDARY_MONITOR));
     message_->SetAutoColorReadabilityEnabled(false);
     message_->SetFont(rb.GetFont(ui::ResourceBundle::LargeFont));
@@ skipping 38 matching lines @@
         x + text_size.width() + kShortcutMargin,
         y + (height - image_size.height()) / 2,
         image_size.width(), image_size.height());
   }
 
  private:
   views::Label* message_;
   views::Label* shortcut_text_;
   views::ImageView* shortcut_image_;
 
-  DISALLOW_COPY_AND_ASSIGN(SecondaryMonitorView);
+  DISALLOW_COPY_AND_ASSIGN(SecondaryDisplayView);
 };
 
 }  // namespace
 
-views::Widget* CreateSecondaryMonitorWidget(aura::Window* parent) {
+views::Widget* CreateSecondaryDisplayWidget(aura::Window* parent) {
   views::Widget* desktop_widget = new views::Widget;
   views::Widget::InitParams params(
       views::Widget::InitParams::TYPE_WINDOW_FRAMELESS);
-  SecondaryMonitorView* view = new SecondaryMonitorView();
+  SecondaryDisplayView* view = new SecondaryDisplayView();
   params.delegate = view;
   params.parent = parent;
   desktop_widget->Init(params);
   desktop_widget->SetContentsView(view);
   desktop_widget->Show();
-  desktop_widget->GetNativeView()->SetName("SecondaryMonitor");
+  desktop_widget->GetNativeView()->SetName("SecondaryDisplay");
   return desktop_widget;
 }
 
 }  // namespace ash