chrome/browser/ui/webui/options2/personal_options_handler2.cc - Issue 9003014: Replace WebUI::tab_contents() with web_contents() and switch all users to use web_contents.h inst...

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/options2/personal_options_handler2.cc

Issue 9003014: Replace WebUI::tab_contents() with web_contents() and switch all users to use web_contents.h inst... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: '' Created 9 years 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

Index: chrome/browser/ui/webui/options2/personal_options_handler2.cc

===================================================================

--- chrome/browser/ui/webui/options2/personal_options_handler2.cc (revision 116011)

+++ chrome/browser/ui/webui/options2/personal_options_handler2.cc (working copy)

@@ -33,9 +33,10 @@

#include "chrome/common/chrome_switches.h"

#include "chrome/common/net/gaia/google_service_auth_error.h"

#include "chrome/common/url_constants.h"

-#include "content/browser/tab_contents/tab_contents.h"

+#include "content/browser/tab_contents/navigation_controller.h"

#include "content/public/browser/notification_service.h"

#include "content/public/browser/user_metrics.h"

+#include "content/public/browser/web_contents.h"

#include "grit/chromium_strings.h"

#include "grit/generated_resources.h"

#include "grit/locale_settings.h"

@@ -411,7 +412,7 @@

g_browser_process->profile_manager()->GetProfileInfoCache();

ListValue profile_info_list;

FilePath current_profile_path =

- web_ui()->tab_contents()->GetBrowserContext()->GetPath();

+ web_ui()->web_contents()->GetBrowserContext()->GetPath();

for (size_t i = 0, e = cache.GetNumberOfProfiles(); i < e; ++i) {

DictionaryValue* profile_value = new DictionaryValue();

FilePath profile_path = cache.GetPathOfProfileAtIndex(i);

« no previous file with comments | « chrome/browser/ui/webui/options2/options_ui2.cc ('k') | chrome/browser/ui/webui/plugins_ui.h » ('j') | no next file with comments »