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

Side by Side Diff: chrome/browser/cocoa/browser_window_cocoa.mm

Issue 402065: Made HtmlDialogWindowController on OS X use its own browser. (Closed)
Patch Set: synced to head Created 11 years, 1 month 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
« no previous file with comments | « no previous file | chrome/browser/cocoa/html_dialog_window_controller.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 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 "base/gfx/rect.h" 5 #include "base/gfx/rect.h"
6 #include "base/logging.h" 6 #include "base/logging.h"
7 #include "base/sys_string_conversions.h" 7 #include "base/sys_string_conversions.h"
8 #include "chrome/app/chrome_dll_resource.h" 8 #include "chrome/app/chrome_dll_resource.h"
9 #include "chrome/browser/bookmarks/bookmark_utils.h" 9 #include "chrome/browser/bookmarks/bookmark_utils.h"
10 #include "chrome/browser/cocoa/browser_window_cocoa.h" 10 #include "chrome/browser/cocoa/browser_window_cocoa.h"
(...skipping 300 matching lines...) Expand 10 before | Expand all | Expand 10 after
311 void BrowserWindowCocoa::ConfirmBrowserCloseWithPendingDownloads() { 311 void BrowserWindowCocoa::ConfirmBrowserCloseWithPendingDownloads() {
312 browser_->InProgressDownloadResponse(true); 312 browser_->InProgressDownloadResponse(true);
313 } 313 }
314 314
315 void BrowserWindowCocoa::ShowHTMLDialog(HtmlDialogUIDelegate* delegate, 315 void BrowserWindowCocoa::ShowHTMLDialog(HtmlDialogUIDelegate* delegate,
316 gfx::NativeWindow parent_window) { 316 gfx::NativeWindow parent_window) {
317 if (!parent_window) { 317 if (!parent_window) {
318 parent_window = GetNativeHandle(); 318 parent_window = GetNativeHandle();
319 } 319 }
320 [HtmlDialogWindowController showHtmlDialog:delegate 320 [HtmlDialogWindowController showHtmlDialog:delegate
321 parentWindow:parent_window 321 profile:browser_->profile()
322 browser:browser_]; 322 parentWindow:parent_window];
323 } 323 }
324 324
325 void BrowserWindowCocoa::UserChangedTheme() { 325 void BrowserWindowCocoa::UserChangedTheme() {
326 [controller_ userChangedTheme]; 326 [controller_ userChangedTheme];
327 } 327 }
328 328
329 int BrowserWindowCocoa::GetExtraRenderViewHeight() const { 329 int BrowserWindowCocoa::GetExtraRenderViewHeight() const {
330 // Currently this is only used on linux. 330 // Currently this is only used on linux.
331 return 0; 331 return 0;
332 } 332 }
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
434 break; 434 break;
435 } 435 }
436 } 436 }
437 437
438 void BrowserWindowCocoa::DestroyBrowser() { 438 void BrowserWindowCocoa::DestroyBrowser() {
439 [controller_ destroyBrowser]; 439 [controller_ destroyBrowser];
440 440
441 // at this point the controller is dead (autoreleased), so 441 // at this point the controller is dead (autoreleased), so
442 // make sure we don't try to reference it any more. 442 // make sure we don't try to reference it any more.
443 } 443 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/cocoa/html_dialog_window_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698