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

Unified Diff: chrome/browser/app_controller_mac.h

Issue 929073002: Only return fully initialized profiles in ProfileManager::GetProfileByPath. (Closed) Base URL: https://chromium.googlesource.com/chromium/src@master
Patch Set: DCHECK Created 5 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/app_controller_mac.mm » ('j') | chrome/browser/profiles/profile_manager.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/app_controller_mac.h
diff --git a/chrome/browser/app_controller_mac.h b/chrome/browser/app_controller_mac.h
index 8d53e339d68cd072ad7b1274a3af28490038e562..4b2dc8984d6fa463780c1249d09a7ba993a6344c 100644
--- a/chrome/browser/app_controller_mac.h
+++ b/chrome/browser/app_controller_mac.h
@@ -10,6 +10,7 @@
#import <Cocoa/Cocoa.h>
#include <vector>
+#include "base/files/file_path.h"
#include "base/mac/scoped_nsobject.h"
#include "base/memory/scoped_ptr.h"
#include "base/observer_list.h"
@@ -57,7 +58,7 @@ class WorkAreaWatcherObserver;
// a weak pointer that is updated to match the corresponding cache entry
// during a profile switch.
BookmarkMenuBridge* bookmarkMenuBridge_;
- std::map<Profile*, BookmarkMenuBridge*> profileBookmarkMenuBridgeMap_;
+ std::map<base::FilePath, BookmarkMenuBridge*> profileBookmarkMenuBridgeMap_;
scoped_ptr<HistoryMenuBridge> historyMenuBridge_;
« no previous file with comments | « no previous file | chrome/browser/app_controller_mac.mm » ('j') | chrome/browser/profiles/profile_manager.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698