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

Side by Side Diff: chrome/browser/ui/cocoa/web_dialog_window_controller.mm

Issue 10897034: First part of PAGE_TRANSITION_START_PAGE cleanup. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased Created 8 years, 3 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 #import "chrome/browser/ui/cocoa/web_dialog_window_controller.h" 5 #import "chrome/browser/ui/cocoa/web_dialog_window_controller.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/memory/scoped_nsobject.h" 8 #include "base/memory/scoped_nsobject.h"
9 #include "base/sys_string_conversions.h" 9 #include "base/sys_string_conversions.h"
10 #import "chrome/browser/ui/browser_dialogs.h" 10 #import "chrome/browser/ui/browser_dialogs.h"
(...skipping 342 matching lines...) Expand 10 before | Expand all | Expand 10 after
353 setContentView:tabContents_->web_contents()->GetNativeView()]; 353 setContentView:tabContents_->web_contents()->GetNativeView()];
354 tabContents_->web_contents()->SetDelegate(delegate_.get()); 354 tabContents_->web_contents()->SetDelegate(delegate_.get());
355 355
356 // This must be done before loading the page; see the comments in 356 // This must be done before loading the page; see the comments in
357 // WebDialogUI. 357 // WebDialogUI.
358 WebDialogUI::SetDelegate(tabContents_->web_contents(), delegate_.get()); 358 WebDialogUI::SetDelegate(tabContents_->web_contents(), delegate_.get());
359 359
360 tabContents_->web_contents()->GetController().LoadURL( 360 tabContents_->web_contents()->GetController().LoadURL(
361 delegate_->GetDialogContentURL(), 361 delegate_->GetDialogContentURL(),
362 content::Referrer(), 362 content::Referrer(),
363 content::PAGE_TRANSITION_START_PAGE, 363 content::PAGE_TRANSITION_AUTO_TOPLEVEL,
364 std::string()); 364 std::string());
365 365
366 // TODO(akalin): add accelerator for ESC to close the dialog box. 366 // TODO(akalin): add accelerator for ESC to close the dialog box.
367 // 367 //
368 // TODO(akalin): Figure out why implementing (void)cancel:(id)sender 368 // TODO(akalin): Figure out why implementing (void)cancel:(id)sender
369 // to do the above doesn't work. 369 // to do the above doesn't work.
370 } 370 }
371 371
372 - (void)windowWillClose:(NSNotification*)notification { 372 - (void)windowWillClose:(NSNotification*)notification {
373 delegate_->WindowControllerClosed(); 373 delegate_->WindowControllerClosed();
374 [self autorelease]; 374 [self autorelease];
375 } 375 }
376 376
377 @end 377 @end
OLDNEW
« no previous file with comments | « chrome/browser/ui/browser_navigator.cc ('k') | chrome/browser/ui/cocoa/web_intent_picker_cocoa.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698