| Index: chrome/browser/ui/cocoa/autofill/autofill_dialog_window_controller.mm
|
| diff --git a/chrome/browser/ui/cocoa/autofill/autofill_dialog_cocoa.mm b/chrome/browser/ui/cocoa/autofill/autofill_dialog_window_controller.mm
|
| similarity index 73%
|
| copy from chrome/browser/ui/cocoa/autofill/autofill_dialog_cocoa.mm
|
| copy to chrome/browser/ui/cocoa/autofill/autofill_dialog_window_controller.mm
|
| index 082272193c6c7d77aaf24a58495957bd80fced71..f650d0b7cc60fc7cc92663952cfbbea433132d13 100644
|
| --- a/chrome/browser/ui/cocoa/autofill/autofill_dialog_cocoa.mm
|
| +++ b/chrome/browser/ui/cocoa/autofill/autofill_dialog_window_controller.mm
|
| @@ -2,26 +2,21 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "chrome/browser/ui/cocoa/autofill/autofill_dialog_cocoa.h"
|
| +#import "chrome/browser/ui/cocoa/autofill/autofill_dialog_window_controller.h"
|
|
|
| -#include "base/bind.h"
|
| -#include "base/mac/bundle_locations.h"
|
| #include "base/mac/foundation_util.h"
|
| #include "base/mac/scoped_nsobject.h"
|
| -#include "base/message_loop/message_loop.h"
|
| #include "base/strings/sys_string_conversions.h"
|
| #include "chrome/browser/ui/autofill/autofill_dialog_view_delegate.h"
|
| #include "chrome/browser/ui/chrome_style.h"
|
| #import "chrome/browser/ui/cocoa/autofill/autofill_account_chooser.h"
|
| -#import "chrome/browser/ui/cocoa/autofill/autofill_details_container.h"
|
| +#include "chrome/browser/ui/cocoa/autofill/autofill_dialog_cocoa.h"
|
| #include "chrome/browser/ui/cocoa/autofill/autofill_dialog_constants.h"
|
| -#import "chrome/browser/ui/cocoa/autofill/autofill_input_field.h"
|
| #import "chrome/browser/ui/cocoa/autofill/autofill_main_container.h"
|
| #import "chrome/browser/ui/cocoa/autofill/autofill_overlay_controller.h"
|
| #import "chrome/browser/ui/cocoa/autofill/autofill_section_container.h"
|
| #import "chrome/browser/ui/cocoa/autofill/autofill_sign_in_container.h"
|
| #import "chrome/browser/ui/cocoa/autofill/autofill_textfield.h"
|
| -#import "chrome/browser/ui/cocoa/constrained_window/constrained_window_custom_sheet.h"
|
| #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_custom_window.h"
|
| #include "content/public/browser/web_contents.h"
|
| #include "content/public/browser/web_contents_view.h"
|
| @@ -29,8 +24,8 @@
|
| #import "ui/base/cocoa/flipped_view.h"
|
| #include "ui/base/cocoa/window_size_constants.h"
|
| #include "ui/base/l10n/l10n_util.h"
|
| -#include "ui/gfx/platform_font.h"
|
|
|
| +namespace {
|
| const CGFloat kAccountChooserHeight = 20.0;
|
| const CGFloat kMinimumContentsHeight = 101;
|
|
|
| @@ -39,199 +34,7 @@ const CGFloat kDecorationHeight = kAccountChooserHeight +
|
| autofill::kDetailVerticalPadding +
|
| chrome_style::kClientBottomPadding +
|
| chrome_style::kTitleTopPadding;
|
| -
|
| -namespace autofill {
|
| -
|
| -// static
|
| -AutofillDialogView* AutofillDialogView::Create(
|
| - AutofillDialogViewDelegate* delegate) {
|
| - return new AutofillDialogCocoa(delegate);
|
| -}
|
| -
|
| -AutofillDialogCocoa::AutofillDialogCocoa(AutofillDialogViewDelegate* delegate)
|
| - : close_weak_ptr_factory_(this),
|
| - delegate_(delegate) {
|
| -}
|
| -
|
| -AutofillDialogCocoa::~AutofillDialogCocoa() {
|
| - // Cancel potential relayout requests, since the AutofillDialogController
|
| - // is about to go away, but relayout requests assume it will still exist.
|
| - [sheet_delegate_ cancelRelayout];
|
| -}
|
| -
|
| -void AutofillDialogCocoa::Show() {
|
| - // This should only be called once.
|
| - DCHECK(!sheet_delegate_.get());
|
| - sheet_delegate_.reset([[AutofillDialogWindowController alloc]
|
| - initWithWebContents:delegate_->GetWebContents()
|
| - autofillDialog:this]);
|
| - base::scoped_nsobject<CustomConstrainedWindowSheet> sheet(
|
| - [[CustomConstrainedWindowSheet alloc]
|
| - initWithCustomWindow:[sheet_delegate_ window]]);
|
| - constrained_window_.reset(
|
| - new ConstrainedWindowMac(this, delegate_->GetWebContents(), sheet));
|
| - [sheet_delegate_ show];
|
| -}
|
| -
|
| -void AutofillDialogCocoa::Hide() {
|
| - [sheet_delegate_ hide];
|
| -}
|
| -
|
| -void AutofillDialogCocoa::PerformClose() {
|
| - if (!close_weak_ptr_factory_.HasWeakPtrs()) {
|
| - base::MessageLoop::current()->PostTask(
|
| - FROM_HERE,
|
| - base::Bind(&AutofillDialogCocoa::CloseNow,
|
| - close_weak_ptr_factory_.GetWeakPtr()));
|
| - }
|
| -}
|
| -
|
| -void AutofillDialogCocoa::CloseNow() {
|
| - constrained_window_->CloseWebContentsModalDialog();
|
| -}
|
| -
|
| -void AutofillDialogCocoa::UpdatesStarted() {
|
| -}
|
| -
|
| -void AutofillDialogCocoa::UpdatesFinished() {
|
| -}
|
| -
|
| -void AutofillDialogCocoa::UpdateAccountChooser() {
|
| - [sheet_delegate_ updateAccountChooser];
|
| -}
|
| -
|
| -void AutofillDialogCocoa::UpdateButtonStrip() {
|
| - [sheet_delegate_ updateButtonStrip];
|
| -}
|
| -
|
| -void AutofillDialogCocoa::UpdateOverlay() {
|
| - // TODO(estade): only update the overlay.
|
| - UpdateButtonStrip();
|
| -}
|
| -
|
| -void AutofillDialogCocoa::UpdateDetailArea() {
|
| -}
|
| -
|
| -void AutofillDialogCocoa::UpdateForErrors() {
|
| -}
|
| -
|
| -void AutofillDialogCocoa::UpdateNotificationArea() {
|
| - [sheet_delegate_ updateNotificationArea];
|
| -}
|
| -
|
| -void AutofillDialogCocoa::UpdateSection(DialogSection section) {
|
| - [sheet_delegate_ updateSection:section];
|
| -}
|
| -
|
| -void AutofillDialogCocoa::FillSection(DialogSection section,
|
| - const DetailInput& originating_input) {
|
| - [sheet_delegate_ fillSection:section forInput:originating_input];
|
| -}
|
| -
|
| -void AutofillDialogCocoa::GetUserInput(DialogSection section,
|
| - DetailOutputMap* output) {
|
| - [sheet_delegate_ getInputs:output forSection:section];
|
| -}
|
| -
|
| -string16 AutofillDialogCocoa::GetCvc() {
|
| - return base::SysNSStringToUTF16([sheet_delegate_ getCvc]);
|
| -}
|
| -
|
| -bool AutofillDialogCocoa::HitTestInput(const DetailInput& input,
|
| - const gfx::Point& screen_point) {
|
| - // TODO(dbeam): implement.
|
| - return false;
|
| -}
|
| -
|
| -bool AutofillDialogCocoa::SaveDetailsLocally() {
|
| - return [sheet_delegate_ saveDetailsLocally];
|
| -}
|
| -
|
| -const content::NavigationController* AutofillDialogCocoa::ShowSignIn() {
|
| - return [sheet_delegate_ showSignIn];
|
| -}
|
| -
|
| -void AutofillDialogCocoa::HideSignIn() {
|
| - [sheet_delegate_ hideSignIn];
|
| -}
|
| -
|
| -void AutofillDialogCocoa::ModelChanged() {
|
| - [sheet_delegate_ modelChanged];
|
| -}
|
| -
|
| -void AutofillDialogCocoa::UpdateErrorBubble() {
|
| - [sheet_delegate_ updateErrorBubble];
|
| -}
|
| -
|
| -TestableAutofillDialogView* AutofillDialogCocoa::GetTestableView() {
|
| - return this;
|
| -}
|
| -
|
| -void AutofillDialogCocoa::OnSignInResize(const gfx::Size& pref_size) {
|
| - [sheet_delegate_ onSignInResize:
|
| - NSMakeSize(pref_size.width(), pref_size.height())];
|
| -}
|
| -
|
| -void AutofillDialogCocoa::SubmitForTesting() {
|
| - [sheet_delegate_ accept:nil];
|
| -}
|
| -
|
| -void AutofillDialogCocoa::CancelForTesting() {
|
| - [sheet_delegate_ cancel:nil];
|
| -}
|
| -
|
| -string16 AutofillDialogCocoa::GetTextContentsOfInput(const DetailInput& input) {
|
| - for (size_t i = SECTION_MIN; i <= SECTION_MAX; ++i) {
|
| - DialogSection section = static_cast<DialogSection>(i);
|
| - DetailOutputMap contents;
|
| - [sheet_delegate_ getInputs:&contents forSection:section];
|
| - DetailOutputMap::const_iterator it = contents.find(&input);
|
| - if (it != contents.end())
|
| - return it->second;
|
| - }
|
| -
|
| - NOTREACHED();
|
| - return string16();
|
| -}
|
| -
|
| -void AutofillDialogCocoa::SetTextContentsOfInput(const DetailInput& input,
|
| - const string16& contents) {
|
| - [sheet_delegate_ setTextContents:base::SysUTF16ToNSString(contents)
|
| - forInput:input];
|
| -}
|
| -
|
| -void AutofillDialogCocoa::SetTextContentsOfSuggestionInput(
|
| - DialogSection section,
|
| - const base::string16& text) {
|
| - [sheet_delegate_ setTextContents:base::SysUTF16ToNSString(text)
|
| - ofSuggestionForSection:section];
|
| -}
|
| -
|
| -void AutofillDialogCocoa::ActivateInput(const DetailInput& input) {
|
| - [sheet_delegate_ activateFieldForInput:input];
|
| -}
|
| -
|
| -gfx::Size AutofillDialogCocoa::GetSize() const {
|
| - return gfx::Size(NSSizeToCGSize([[sheet_delegate_ window] frame].size));
|
| -}
|
| -
|
| -content::WebContents* AutofillDialogCocoa::GetSignInWebContents() {
|
| - return [sheet_delegate_ getSignInWebContents];
|
| -}
|
| -
|
| -
|
| -bool AutofillDialogCocoa::IsShowingOverlay() const {
|
| - return [sheet_delegate_ IsShowingOverlay];
|
| -}
|
| -
|
| -void AutofillDialogCocoa::OnConstrainedWindowClosed(
|
| - ConstrainedWindowMac* window) {
|
| - constrained_window_.reset();
|
| - // |this| belongs to |delegate_|, so no self-destruction here.
|
| - delegate_->ViewClosed();
|
| -}
|
| -
|
| -} // autofill
|
| +} // namespace
|
|
|
| #pragma mark "Loading" Shield
|
|
|
|
|