Move ash/wm's DialogFrameView to ui/views/window; etc.

chrome/browser/chromeos/enrollment_dialog_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 "chrome/browser/chromeos/enrollment_dialog_view.h"
 
 #include "base/bind.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/chromeos/cros/network_library.h"
 #include "chrome/browser/extensions/extension_host.h"
@@ skipping 37 matching lines @@
   virtual bool Accept() OVERRIDE;
   virtual string16 GetDialogButtonLabel(ui::DialogButton button) const OVERRIDE;
 
   // views::WidgetDelegate overrides
   virtual ui::ModalType GetModalType() const OVERRIDE;
   virtual string16 GetWindowTitle() const OVERRIDE;
 
   // views::View overrides
   virtual gfx::Size GetPreferredSize() OVERRIDE;
 
-  // views::Widget overrides
-  virtual views::View* GetContentsView() OVERRIDE;
-
  private:
   EnrollmentDialogView(const std::string& network_name,
                        Profile* profile,
                        const GURL& target_uri,
                        const base::Closure& connect);
   void InitDialog();
 
   std::string network_name_;
   Profile* profile_;
   GURL target_uri_;
@@ skipping 67 matching lines @@
 }
 
 string16 EnrollmentDialogView::GetWindowTitle() const {
   return l10n_util::GetStringUTF16(IDS_NETWORK_ENROLLMENT_HANDLER_TITLE);
 }
 
 gfx::Size EnrollmentDialogView::GetPreferredSize() {
   return gfx::Size(kDefaultWidth, kDefaultHeight);
 }
 
-views::View* EnrollmentDialogView::GetContentsView() {
-  return this;
-}
-
 void EnrollmentDialogView::InitDialog() {
   added_cert_ = false;
   // Create the views and layout manager and set them up.
   views::Label* label = new views::Label(
       l10n_util::GetStringFUTF16(IDS_NETWORK_ENROLLMENT_HANDLER_INSTRUCTIONS,
                                  UTF8ToUTF16(network_name_)));
   label->SetFont(ui::ResourceBundle::GetSharedInstance().GetFont(
       ui::ResourceBundle::BaseFont));
   label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
   label->SetMultiLine(true);
@@ skipping 91 matching lines @@
 ////////////////////////////////////////////////////////////////////////////////
 // Factory function.
 
 EnrollmentDelegate* CreateEnrollmentDelegate(gfx::NativeWindow owning_window,
                                              const std::string& network_name,
                                              Profile* profile) {
   return new DialogEnrollmentDelegate(owning_window, network_name, profile);
 }
 
 }  // namespace chromeos