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

Side by Side Diff: trunk/src/chrome/browser/browser_process_platform_part_mac.mm

Issue 24052002: Revert 221580 "Make AppShimHostManager a RefCountedThreadSafe." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 3 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 | « trunk/src/chrome/browser/browser_process_platform_part_mac.h ('k') | no next file » | 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) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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/browser_process_platform_part_mac.h" 5 #include "chrome/browser/browser_process_platform_part_mac.h"
6 6
7 #include "apps/app_shim/app_shim_host_manager_mac.h"
7 #include "chrome/browser/chrome_browser_application_mac.h" 8 #include "chrome/browser/chrome_browser_application_mac.h"
8 #include "chrome/browser/ui/app_list/app_list_service.h" 9 #include "chrome/browser/ui/app_list/app_list_service.h"
9 10
10 BrowserProcessPlatformPart::BrowserProcessPlatformPart() { 11 BrowserProcessPlatformPart::BrowserProcessPlatformPart() {
11 } 12 }
12 13
13 BrowserProcessPlatformPart::~BrowserProcessPlatformPart() { 14 BrowserProcessPlatformPart::~BrowserProcessPlatformPart() {
14 } 15 }
15 16
16 void BrowserProcessPlatformPart::StartTearDown() { 17 void BrowserProcessPlatformPart::StartTearDown() {
17 app_shim_host_manager_ = NULL; 18 app_shim_host_manager_.reset();
18 } 19 }
19 20
20 void BrowserProcessPlatformPart::AttemptExit() { 21 void BrowserProcessPlatformPart::AttemptExit() {
21 // On the Mac, the application continues to run once all windows are closed. 22 // On the Mac, the application continues to run once all windows are closed.
22 // Terminate will result in a CloseAllBrowsers() call, and once (and if) 23 // Terminate will result in a CloseAllBrowsers() call, and once (and if)
23 // that is done, will cause the application to exit cleanly. 24 // that is done, will cause the application to exit cleanly.
24 chrome_browser_application_mac::Terminate(); 25 chrome_browser_application_mac::Terminate();
25 } 26 }
26 27
27 void BrowserProcessPlatformPart::PreMainMessageLoopRun() { 28 void BrowserProcessPlatformPart::PreMainMessageLoopRun() {
28 app_shim_host_manager_ = new AppShimHostManager; 29 app_shim_host_manager_.reset(new AppShimHostManager);
29 AppListService::InitAll(NULL); 30 AppListService::InitAll(NULL);
30 } 31 }
31 32
32 AppShimHostManager* BrowserProcessPlatformPart::app_shim_host_manager() { 33 AppShimHostManager* BrowserProcessPlatformPart::app_shim_host_manager() {
33 return app_shim_host_manager_.get(); 34 return app_shim_host_manager_.get();
34 } 35 }
OLDNEW
« no previous file with comments | « trunk/src/chrome/browser/browser_process_platform_part_mac.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698