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

Side by Side Diff: chrome/browser/chrome_browser_main_mac.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 unified diff | Download patch
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/chrome_browser_main_mac.h" 5 #include "chrome/browser/chrome_browser_main_mac.h"
6 6
7 #import <Cocoa/Cocoa.h> 7 #import <Cocoa/Cocoa.h>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/files/file_path.h" 10 #include "base/files/file_path.h"
11 #include "base/files/file_util.h" 11 #include "base/files/file_util.h"
12 #include "base/mac/bundle_locations.h" 12 #include "base/mac/bundle_locations.h"
13 #import "base/mac/foundation_util.h"
13 #include "base/mac/mac_util.h" 14 #include "base/mac/mac_util.h"
14 #include "base/mac/scoped_nsobject.h" 15 #include "base/mac/scoped_nsobject.h"
15 #include "base/path_service.h" 16 #include "base/path_service.h"
16 #include "base/thread_task_runner_handle.h" 17 #include "base/thread_task_runner_handle.h"
17 #import "chrome/browser/app_controller_mac.h" 18 #import "chrome/browser/app_controller_mac.h"
18 #include "chrome/browser/apps/app_shim/app_shim_host_manager_mac.h" 19 #include "chrome/browser/apps/app_shim/app_shim_host_manager_mac.h"
19 #include "chrome/browser/browser_process.h" 20 #include "chrome/browser/browser_process.h"
20 #import "chrome/browser/chrome_browser_application_mac.h" 21 #import "chrome/browser/chrome_browser_application_mac.h"
21 #include "chrome/browser/mac/install_from_dmg.h" 22 #include "chrome/browser/mac/install_from_dmg.h"
22 #import "chrome/browser/mac/keystone_glue.h" 23 #import "chrome/browser/mac/keystone_glue.h"
(...skipping 174 matching lines...) Expand 10 before | Expand all | Expand 10 after
197 KeystoneGlue* glue = [KeystoneGlue defaultKeystoneGlue]; 198 KeystoneGlue* glue = [KeystoneGlue defaultKeystoneGlue];
198 if (glue && ![glue isRegisteredAndActive]) { 199 if (glue && ![glue isRegisteredAndActive]) {
199 // If profile loading has failed, we still need to handle other tasks 200 // If profile loading has failed, we still need to handle other tasks
200 // like marking of the product as active. 201 // like marking of the product as active.
201 [glue updateProfileCountsWithNumProfiles:0 202 [glue updateProfileCountsWithNumProfiles:0
202 numSignedInProfiles:0]; 203 numSignedInProfiles:0];
203 } 204 }
204 } 205 }
205 206
206 void ChromeBrowserMainPartsMac::DidEndMainMessageLoop() { 207 void ChromeBrowserMainPartsMac::DidEndMainMessageLoop() {
207 AppController* appController = [NSApp delegate]; 208 AppController* appController =
209 base::mac::ObjCCastStrict<AppController>([NSApp delegate]);
208 [appController didEndMainMessageLoop]; 210 [appController didEndMainMessageLoop];
209 } 211 }
OLDNEW
« no previous file with comments | « chrome/browser/app_controller_mac_browsertest.mm ('k') | chrome/browser/ui/app_list/app_list_service_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698