Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(69)

Side by Side Diff: trunk/src/chrome/browser/ui/views/autofill/autofill_dialog_views.cc

Issue 21372006: Revert 212329 "Reland "Close web contents modal dialogs on conte..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 #include "chrome/browser/ui/views/autofill/autofill_dialog_views.h" 5 #include "chrome/browser/ui/views/autofill/autofill_dialog_views.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/strings/utf_string_conversions.h" 10 #include "base/strings/utf_string_conversions.h"
(...skipping 1230 matching lines...) Expand 10 before | Expand all | Expand 10 after
1241 // care of deleting itself after calling DeleteDelegate(). 1241 // care of deleting itself after calling DeleteDelegate().
1242 WebContentsModalDialogManager* web_contents_modal_dialog_manager = 1242 WebContentsModalDialogManager* web_contents_modal_dialog_manager =
1243 WebContentsModalDialogManager::FromWebContents( 1243 WebContentsModalDialogManager::FromWebContents(
1244 controller_->web_contents()); 1244 controller_->web_contents());
1245 window_ = CreateWebContentsModalDialogViews( 1245 window_ = CreateWebContentsModalDialogViews(
1246 this, 1246 this,
1247 controller_->web_contents()->GetView()->GetNativeView(), 1247 controller_->web_contents()->GetView()->GetNativeView(),
1248 web_contents_modal_dialog_manager->delegate()-> 1248 web_contents_modal_dialog_manager->delegate()->
1249 GetWebContentsModalDialogHost()); 1249 GetWebContentsModalDialogHost());
1250 web_contents_modal_dialog_manager->ShowDialog(window_->GetNativeView()); 1250 web_contents_modal_dialog_manager->ShowDialog(window_->GetNativeView());
1251 web_contents_modal_dialog_manager->SetPreventCloseOnLoadStart(
1252 window_->GetNativeView(), true);
1253 focus_manager_ = window_->GetFocusManager(); 1251 focus_manager_ = window_->GetFocusManager();
1254 focus_manager_->AddFocusChangeListener(this); 1252 focus_manager_->AddFocusChangeListener(this);
1255 1253
1256 // Listen for size changes on the browser. 1254 // Listen for size changes on the browser.
1257 views::Widget* browser_widget = 1255 views::Widget* browser_widget =
1258 views::Widget::GetTopLevelWidgetForNativeView( 1256 views::Widget::GetTopLevelWidgetForNativeView(
1259 controller_->web_contents()->GetView()->GetNativeView()); 1257 controller_->web_contents()->GetView()->GetNativeView());
1260 observer_.Add(browser_widget); 1258 observer_.Add(browser_widget);
1261 1259
1262 gfx::Image splash_image = controller_->SplashPageImage(); 1260 gfx::Image splash_image = controller_->SplashPageImage();
(...skipping 1098 matching lines...) Expand 10 before | Expand all | Expand 10 after
2361 AutofillDialogViews::DetailsGroup::DetailsGroup(DialogSection section) 2359 AutofillDialogViews::DetailsGroup::DetailsGroup(DialogSection section)
2362 : section(section), 2360 : section(section),
2363 container(NULL), 2361 container(NULL),
2364 manual_input(NULL), 2362 manual_input(NULL),
2365 suggested_info(NULL), 2363 suggested_info(NULL),
2366 suggested_button(NULL) {} 2364 suggested_button(NULL) {}
2367 2365
2368 AutofillDialogViews::DetailsGroup::~DetailsGroup() {} 2366 AutofillDialogViews::DetailsGroup::~DetailsGroup() {}
2369 2367
2370 } // namespace autofill 2368 } // namespace autofill
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698