chrome/browser/ui/webui/options/browser_options_handler.h - Issue 6961013: Allow chrome to become the os default handler for arbitrary protocols on mac/win.

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/browser_options_handler.h

Issue 6961013: Allow chrome to become the os default handler for arbitrary protocols on mac/win. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: More changes for comments; fix for a bug introduced with DefaultWebClientWorker refactoring Created 9 years, 7 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/shell_integration_win.cc ('k') | chrome/browser/ui/webui/options/browser_options_handler.cc » ('j') | chrome/installer/setup/setup_main.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/options/browser_options_handler.h

diff --git a/chrome/browser/ui/webui/options/browser_options_handler.h b/chrome/browser/ui/webui/options/browser_options_handler.h

index 67bbb34186a3cd99f33f1c0e925c9e9d31c44e70..e14a6a56fe144336adbd3b130f82bde0c0f96ad6 100644

--- a/chrome/browser/ui/webui/options/browser_options_handler.h

+++ b/chrome/browser/ui/webui/options/browser_options_handler.h

@@ -21,7 +21,7 @@ class TemplateURLModel;

// Chrome browser options page UI handler.

class BrowserOptionsHandler : public OptionsPageUIHandler,

public AutocompleteControllerDelegate,

- public ShellIntegration::DefaultBrowserObserver,

+ public ShellIntegration::DefaultWebClientObserver,

public TemplateURLModelObserver,

public ui::TableModelObserver {

public:

@@ -37,9 +37,9 @@ class BrowserOptionsHandler : public OptionsPageUIHandler,

// AutocompleteControllerDelegate implementation.

virtual void OnResultChanged(bool default_match_changed);

- // ShellIntegration::DefaultBrowserObserver implementation.

- virtual void SetDefaultBrowserUIState(

- ShellIntegration::DefaultBrowserUIState state);

+ // ShellIntegration::DefaultWebClientObserver implementation.

+ virtual void SetDefaultWebClientUIState(

+ ShellIntegration::DefaultWebClientUIState state);

// TemplateURLModelObserver implementation.

virtual void OnTemplateURLModelChanged();

@@ -88,7 +88,7 @@ class BrowserOptionsHandler : public OptionsPageUIHandler,

void ToggleShowBookmarksBar(const ListValue* args);

// Returns the string ID for the given default browser state.

- int StatusStringIdForState(ShellIntegration::DefaultBrowserState state);

+ int StatusStringIdForState(ShellIntegration::DefaultWebClientState state);

// Gets the current default browser state, and asynchronously reports it to

// the WebUI page.

@@ -106,7 +106,8 @@ class BrowserOptionsHandler : public OptionsPageUIHandler,

// Writes the current set of startup pages to prefs.

void SaveStartupPagesPref();

- scoped_refptr<ShellIntegration::DefaultBrowserWorker> default_browser_worker_;

+ scoped_refptr<ShellIntegration::DefaultBrowserWorker>

+ default_browser_worker_;

StringPrefMember homepage_;

BooleanPrefMember default_browser_policy_;