chrome/browser/ui/cocoa/applescript/browsercrapplication+applescript.mm - Issue 1894903003: Mac: Fix SDK 10.11 Compile errors after clang roll in r387792

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 1894903003: Mac: Fix SDK 10.11 Compile errors after clang roll in r387792 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Mock BaseBubbleController Created 4 years, 8 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/ui/cocoa/applescript/bookmark_node_applescript.mm ('k') | chrome/browser/ui/cocoa/applescript/window_applescript.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/applescript/browsercrapplication+applescript.mm

diff --git a/chrome/browser/ui/cocoa/applescript/browsercrapplication+applescript.mm b/chrome/browser/ui/cocoa/applescript/browsercrapplication+applescript.mm

index 32d24f752d1869985c52ad53ea91b392b47877d6..36e076d423859e915fa5231030a682d026eaa986 100644

--- a/chrome/browser/ui/cocoa/applescript/browsercrapplication+applescript.mm

+++ b/chrome/browser/ui/cocoa/applescript/browsercrapplication+applescript.mm

@@ -5,6 +5,7 @@

#import "chrome/browser/ui/cocoa/applescript/browsercrapplication+applescript.h"

#include "base/logging.h"

+#import "base/mac/foundation_util.h"

#import "base/mac/scoped_nsobject.h"

#import "chrome/browser/app_controller_mac.h"

#include "chrome/browser/bookmarks/bookmark_model_factory.h"

@@ -71,7 +72,8 @@ using bookmarks::BookmarkModel;

}

- (BookmarkFolderAppleScript*)otherBookmarks {

- AppController* appDelegate = [NSApp delegate];

+ AppController* appDelegate =

+ base::mac::ObjCCastStrict<AppController>([NSApp delegate]);

Profile* lastProfile = [appDelegate lastProfile];

if (!lastProfile) {

@@ -94,7 +96,8 @@ using bookmarks::BookmarkModel;

}

- (BookmarkFolderAppleScript*)bookmarksBar {

- AppController* appDelegate = [NSApp delegate];

+ AppController* appDelegate =

+ base::mac::ObjCCastStrict<AppController>([NSApp delegate]);

Profile* lastProfile = [appDelegate lastProfile];

if (!lastProfile) {