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

Side by Side Diff: chrome/browser/ui/cocoa/applescript/browsercrapplication+applescript.mm

Issue 12213075: Swap deprecated BrowserList:: iterators for BrowserIterator in non-Windows code. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge up to r181832 Created 7 years, 10 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/applescript/browsercrapplication+applescript.h" 5 #import "chrome/browser/ui/cocoa/applescript/browsercrapplication+applescript.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #import "base/memory/scoped_nsobject.h" 8 #import "base/memory/scoped_nsobject.h"
9 #import "chrome/browser/app_controller_mac.h" 9 #import "chrome/browser/app_controller_mac.h"
10 #include "chrome/browser/bookmarks/bookmark_model.h" 10 #include "chrome/browser/bookmarks/bookmark_model.h"
11 #include "chrome/browser/bookmarks/bookmark_model_factory.h" 11 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
12 #include "chrome/browser/profiles/profile.h" 12 #include "chrome/browser/profiles/profile.h"
13 #include "chrome/browser/ui/browser.h" 13 #include "chrome/browser/ui/browser.h"
14 #include "chrome/browser/ui/browser_iterator.h"
14 #include "chrome/browser/ui/browser_list.h" 15 #include "chrome/browser/ui/browser_list.h"
15 #import "chrome/browser/ui/cocoa/applescript/bookmark_folder_applescript.h" 16 #import "chrome/browser/ui/cocoa/applescript/bookmark_folder_applescript.h"
16 #import "chrome/browser/ui/cocoa/applescript/constants_applescript.h" 17 #import "chrome/browser/ui/cocoa/applescript/constants_applescript.h"
17 #import "chrome/browser/ui/cocoa/applescript/error_applescript.h" 18 #import "chrome/browser/ui/cocoa/applescript/error_applescript.h"
18 #import "chrome/browser/ui/cocoa/applescript/window_applescript.h" 19 #import "chrome/browser/ui/cocoa/applescript/window_applescript.h"
19 20
20 @implementation BrowserCrApplication (AppleScriptAdditions) 21 @implementation BrowserCrApplication (AppleScriptAdditions)
21 22
22 - (NSArray*)appleScriptWindows { 23 - (NSArray*)appleScriptWindows {
23 NSMutableArray* appleScriptWindows = [NSMutableArray 24 NSMutableArray* appleScriptWindows = [NSMutableArray
24 arrayWithCapacity:BrowserList::size()]; 25 arrayWithCapacity:BrowserList::size()];
25 // Iterate through all browsers and check if it closing, 26 // Iterate through all browsers and check if it closing,
26 // if not add it to list. 27 // if not add it to list.
27 for (BrowserList::const_iterator browserIterator = BrowserList::begin(); 28 for (chrome::BrowserIterator browserIterator; !browserIterator.done();
28 browserIterator != BrowserList::end(); ++browserIterator) { 29 browserIterator.Next()) {
29 if ((*browserIterator)->IsAttemptingToCloseBrowser()) 30 if ((*browserIterator)->IsAttemptingToCloseBrowser())
30 continue; 31 continue;
31 32
32 scoped_nsobject<WindowAppleScript> window( 33 scoped_nsobject<WindowAppleScript> window(
33 [[WindowAppleScript alloc] initWithBrowser:*browserIterator]); 34 [[WindowAppleScript alloc] initWithBrowser:*browserIterator]);
34 [window setContainer:NSApp 35 [window setContainer:NSApp
35 property:AppleScript::kWindowsProperty]; 36 property:AppleScript::kWindowsProperty];
36 [appleScriptWindows addObject:window]; 37 [appleScriptWindows addObject:window];
37 } 38 }
38 // Windows sorted by their index value, which is obtained by calling 39 // Windows sorted by their index value, which is obtained by calling
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
129 130
130 - (void)insertInBookmarksFolders:(id)aBookmarkFolder atIndex:(int)index { 131 - (void)insertInBookmarksFolders:(id)aBookmarkFolder atIndex:(int)index {
131 NOTIMPLEMENTED(); 132 NOTIMPLEMENTED();
132 } 133 }
133 134
134 - (void)removeFromBookmarksFoldersAtIndex:(int)index { 135 - (void)removeFromBookmarksFoldersAtIndex:(int)index {
135 NOTIMPLEMENTED(); 136 NOTIMPLEMENTED();
136 } 137 }
137 138
138 @end 139 @end
OLDNEW
« no previous file with comments | « chrome/browser/download/download_status_updater_win.cc ('k') | chrome/browser/ui/gtk/gtk_theme_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698