chrome/browser/ui/webui/options/chromeos/change_picture_options_handler.cc - Issue 7554008: Removal of Profile from content part 6.

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/webui/options/chromeos/change_picture_options_handler.cc

Issue 7554008: Removal of Profile from content part 6. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Profile helper function, rebase Created 9 years, 4 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/webui/options/browser_options_handler.cc ('k') | chrome/browser/ui/webui/options/chromeos/cros_language_options_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/options/chromeos/change_picture_options_handler.cc

diff --git a/chrome/browser/ui/webui/options/chromeos/change_picture_options_handler.cc b/chrome/browser/ui/webui/options/chromeos/change_picture_options_handler.cc

index 0cc1a2b65d860a85a69fbac7f0e699cae6254514..686911f6711c59117834a5455d162010adc0438c 100644

--- a/chrome/browser/ui/webui/options/chromeos/change_picture_options_handler.cc

+++ b/chrome/browser/ui/webui/options/chromeos/change_picture_options_handler.cc

@@ -10,6 +10,7 @@

#include "chrome/browser/chromeos/login/default_user_images.h"

#include "chrome/browser/chromeos/login/user_manager.h"

#include "chrome/browser/chromeos/options/take_photo_dialog.h"

+#include "chrome/browser/profiles/profile.h"

#include "chrome/browser/ui/browser_list.h"

#include "chrome/browser/ui/browser_window.h"

#include "chrome/browser/ui/views/window.h"

@@ -171,7 +172,8 @@ void ChangePictureOptionsHandler::OnPhotoAccepted(const SkBitmap& photo) {

}

gfx::NativeWindow ChangePictureOptionsHandler::GetBrowserWindow() const {

- Browser* browser = BrowserList::FindBrowserWithProfile(web_ui_->GetProfile());

+ Browser* browser =

+ BrowserList::FindBrowserWithProfile(Profile::FromWebUI(web_ui_));

if (!browser)

return NULL;

return browser->window()->GetNativeHandle();