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

Side by Side Diff: chrome/browser/ui/cocoa/extensions/media_galleries_dialog_cocoa.mm

Issue 318733003: Use the media galleries controller interface for the scan result dialog. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: One more const Created 6 years, 6 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/cocoa/extensions/media_galleries_dialog_cocoa.h" 5 #include "chrome/browser/ui/cocoa/extensions/media_galleries_dialog_cocoa.h"
6 6
7 #include "base/mac/scoped_nsobject.h" 7 #include "base/mac/scoped_nsobject.h"
8 #include "base/strings/sys_string_conversions.h" 8 #include "base/strings/sys_string_conversions.h"
9 #include "chrome/browser/ui/chrome_style.h" 9 #include "chrome/browser/ui/chrome_style.h"
10 #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_alert.h" 10 #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_alert.h"
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
102 [[CustomConstrainedWindowSheet alloc] 102 [[CustomConstrainedWindowSheet alloc]
103 initWithCustomWindow:[alert_ window]]); 103 initWithCustomWindow:[alert_ window]]);
104 window_.reset(new ConstrainedWindowMac( 104 window_.reset(new ConstrainedWindowMac(
105 this, controller->WebContents(), sheet)); 105 this, controller->WebContents(), sheet));
106 } 106 }
107 } 107 }
108 108
109 MediaGalleriesDialogCocoa::~MediaGalleriesDialogCocoa() { 109 MediaGalleriesDialogCocoa::~MediaGalleriesDialogCocoa() {
110 } 110 }
111 111
112 void MediaGalleriesDialogCocoa::AcceptDialogForTesting() {
113 OnAcceptClicked();
114 }
115
112 void MediaGalleriesDialogCocoa::InitDialogControls() { 116 void MediaGalleriesDialogCocoa::InitDialogControls() {
113 main_container_.reset([[NSBox alloc] init]); 117 main_container_.reset([[NSBox alloc] init]);
114 [main_container_ setBoxType:NSBoxCustom]; 118 [main_container_ setBoxType:NSBoxCustom];
115 [main_container_ setBorderType:NSLineBorder]; 119 [main_container_ setBorderType:NSLineBorder];
116 [main_container_ setBorderWidth:1]; 120 [main_container_ setBorderWidth:1];
117 [main_container_ setCornerRadius:0]; 121 [main_container_ setCornerRadius:0];
118 [main_container_ setContentViewMargins:NSZeroSize]; 122 [main_container_ setContentViewMargins:NSZeroSize];
119 [main_container_ setTitlePosition:NSNoTitle]; 123 [main_container_ setTitlePosition:NSNoTitle];
120 [main_container_ setBorderColor:[NSColor disabledControlTextColor]]; 124 [main_container_ setBorderColor:[NSColor disabledControlTextColor]];
121 125
(...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after
276 return controller_->GetContextMenu(pref_id); 280 return controller_->GetContextMenu(pref_id);
277 } 281 }
278 282
279 // static 283 // static
280 MediaGalleriesDialog* MediaGalleriesDialog::Create( 284 MediaGalleriesDialog* MediaGalleriesDialog::Create(
281 MediaGalleriesDialogController* controller) { 285 MediaGalleriesDialogController* controller) {
282 base::scoped_nsobject<MediaGalleriesCocoaController> cocoa_controller( 286 base::scoped_nsobject<MediaGalleriesCocoaController> cocoa_controller(
283 [[MediaGalleriesCocoaController alloc] init]); 287 [[MediaGalleriesCocoaController alloc] init]);
284 return new MediaGalleriesDialogCocoa(controller, cocoa_controller); 288 return new MediaGalleriesDialogCocoa(controller, cocoa_controller);
285 } 289 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698