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

Side by Side Diff: chrome/browser/profiles/avatar_menu_actions_desktop.cc

Issue 1242793005: Refactor most c/b/profiles calls to ProfileInfoCache. Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Windows unit test and ChromeOS build Created 5 years, 5 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 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/profiles/avatar_menu_actions_desktop.h" 5 #include "chrome/browser/profiles/avatar_menu_actions_desktop.h"
6 6
7 #include "base/compiler_specific.h" 7 #include "base/compiler_specific.h"
8 #include "base/strings/string_number_conversions.h" 8 #include "base/strings/string_number_conversions.h"
9 #include "chrome/browser/browser_process.h" 9 #include "chrome/browser/browser_process.h"
10 #include "chrome/browser/profiles/profile.h" 10 #include "chrome/browser/profiles/profile.h"
(...skipping 30 matching lines...) Expand all
41 Browser* settings_browser = browser_; 41 Browser* settings_browser = browser_;
42 if (!settings_browser) { 42 if (!settings_browser) {
43 const Browser::CreateParams params(ProfileManager::GetLastUsedProfile(), 43 const Browser::CreateParams params(ProfileManager::GetLastUsedProfile(),
44 chrome::GetActiveDesktop()); 44 chrome::GetActiveDesktop());
45 settings_browser = new Browser(params); 45 settings_browser = new Browser(params);
46 } 46 }
47 chrome::ShowSettingsSubPage(settings_browser, chrome::kCreateProfileSubPage); 47 chrome::ShowSettingsSubPage(settings_browser, chrome::kCreateProfileSubPage);
48 ProfileMetrics::LogProfileAddNewUser(type); 48 ProfileMetrics::LogProfileAddNewUser(type);
49 } 49 }
50 50
51 void AvatarMenuActionsDesktop::EditProfile(Profile* profile, size_t index) { 51 void AvatarMenuActionsDesktop::EditProfile(Profile* profile) {
52 Browser* settings_browser = browser_; 52 Browser* settings_browser = browser_;
53 if (!settings_browser) { 53 if (!settings_browser) {
54 settings_browser = new Browser( 54 settings_browser = new Browser(
55 Browser::CreateParams(profile, chrome::GetActiveDesktop())); 55 Browser::CreateParams(profile, chrome::GetActiveDesktop()));
56 } 56 }
57 // TODO(davidben): The manageProfile page only allows editting the profile 57 // TODO(davidben): The manageProfile page only allows editting the profile
58 // associated with the browser it is opened in. AvatarMenuActionsDesktop 58 // associated with the browser it is opened in. AvatarMenuActionsDesktop
59 // should account for this when picking a browser to open in. 59 // should account for this when picking a browser to open in.
60 chrome::ShowSettingsSubPage(settings_browser, chrome::kManageProfileSubPage); 60 chrome::ShowSettingsSubPage(settings_browser, chrome::kManageProfileSubPage);
61 } 61 }
(...skipping 13 matching lines...) Expand all
75 #if defined(OS_WIN) 75 #if defined(OS_WIN)
76 return chrome::GetActiveDesktop() != chrome::HOST_DESKTOP_TYPE_ASH; 76 return chrome::GetActiveDesktop() != chrome::HOST_DESKTOP_TYPE_ASH;
77 #else 77 #else
78 return true; 78 return true;
79 #endif 79 #endif
80 } 80 }
81 81
82 void AvatarMenuActionsDesktop::ActiveBrowserChanged(Browser* browser) { 82 void AvatarMenuActionsDesktop::ActiveBrowserChanged(Browser* browser) {
83 browser_ = browser; 83 browser_ = browser;
84 } 84 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698