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

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

Issue 93129: Initial download shelf on OS X.... (Closed) Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: fix download_uitest Created 11 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
« no previous file with comments | « chrome/browser/browser.cc ('k') | chrome/browser/cocoa/browser_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/browser/bookmarks/bookmark_utils.h" 8 #include "chrome/browser/bookmarks/bookmark_utils.h"
9 #include "chrome/browser/cocoa/browser_window_cocoa.h" 9 #include "chrome/browser/cocoa/browser_window_cocoa.h"
10 #import "chrome/browser/cocoa/browser_window_controller.h" 10 #import "chrome/browser/cocoa/browser_window_controller.h"
11 #import "chrome/browser/cocoa/clear_browsing_data_controller.h" 11 #import "chrome/browser/cocoa/clear_browsing_data_controller.h"
12 #import "chrome/browser/cocoa/download_shelf_controller.h"
12 #include "chrome/browser/browser.h" 13 #include "chrome/browser/browser.h"
13 #include "chrome/browser/download/download_shelf.h" 14 #include "chrome/browser/download/download_shelf.h"
14 #include "chrome/common/notification_service.h" 15 #include "chrome/common/notification_service.h"
15 #include "chrome/common/pref_names.h" 16 #include "chrome/common/pref_names.h"
16 #include "chrome/common/pref_service.h" 17 #include "chrome/common/pref_service.h"
17 #include "chrome/common/temp_scaffolding_stubs.h" 18 #include "chrome/common/temp_scaffolding_stubs.h"
18 #include "chrome/browser/profile.h" 19 #include "chrome/browser/profile.h"
19 20
20 BrowserWindowCocoa::BrowserWindowCocoa(Browser* browser, 21 BrowserWindowCocoa::BrowserWindowCocoa(Browser* browser,
21 BrowserWindowController* controller, 22 BrowserWindowController* controller,
(...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after
181 void BrowserWindowCocoa::ShowBookmarkManager() { 182 void BrowserWindowCocoa::ShowBookmarkManager() {
182 NOTIMPLEMENTED(); 183 NOTIMPLEMENTED();
183 } 184 }
184 185
185 void BrowserWindowCocoa::ShowBookmarkBubble(const GURL& url, 186 void BrowserWindowCocoa::ShowBookmarkBubble(const GURL& url,
186 bool already_bookmarked) { 187 bool already_bookmarked) {
187 NOTIMPLEMENTED(); 188 NOTIMPLEMENTED();
188 } 189 }
189 190
190 bool BrowserWindowCocoa::IsDownloadShelfVisible() const { 191 bool BrowserWindowCocoa::IsDownloadShelfVisible() const {
191 return download_shelf_ != NULL && download_shelf_->IsShowing(); 192 return [controller_ isDownloadShelfVisible] != NO;
192 } 193 }
193 194
194 DownloadShelf* BrowserWindowCocoa::GetDownloadShelf() { 195 DownloadShelf* BrowserWindowCocoa::GetDownloadShelf() {
195 NOTIMPLEMENTED(); 196 DownloadShelfController* shelfController = [controller_ downloadShelf];
196 if (!download_shelf_.get()) { 197 return [shelfController bridge];
197 download_shelf_.reset(new DownloadShelfMac(browser_));
198 }
199 return download_shelf_.get();
200 } 198 }
201 199
202 void BrowserWindowCocoa::ShowReportBugDialog() { 200 void BrowserWindowCocoa::ShowReportBugDialog() {
203 NOTIMPLEMENTED(); 201 NOTIMPLEMENTED();
204 } 202 }
205 203
206 void BrowserWindowCocoa::ShowClearBrowsingDataDialog() { 204 void BrowserWindowCocoa::ShowClearBrowsingDataDialog() {
207 scoped_nsobject<ClearBrowsingDataController> controller( 205 scoped_nsobject<ClearBrowsingDataController> controller(
208 [[ClearBrowsingDataController alloc] 206 [[ClearBrowsingDataController alloc]
209 initWithProfile:browser_->profile()]); 207 initWithProfile:browser_->profile()]);
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
267 break; 265 break;
268 } 266 }
269 } 267 }
270 268
271 void BrowserWindowCocoa::DestroyBrowser() { 269 void BrowserWindowCocoa::DestroyBrowser() {
272 [controller_ destroyBrowser]; 270 [controller_ destroyBrowser];
273 271
274 // at this point the controller is dead (autoreleased), so 272 // at this point the controller is dead (autoreleased), so
275 // make sure we don't try to reference it any more. 273 // make sure we don't try to reference it any more.
276 } 274 }
OLDNEW
« no previous file with comments | « chrome/browser/browser.cc ('k') | chrome/browser/cocoa/browser_window_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698