Implement most of the "basics" pref panel on Mac, including code to set the default browser. Fix up some related comments around the code.

Review URL: http://codereview.chromium.org/113032

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15445 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 10 insertions, 1 deletions

diff --git a/chrome/common/pref_member.h b/chrome/common/pref_member.h
index 34db9bd..4b96907 100644
--- a/chrome/common/pref_member.h
+++ b/chrome/common/pref_member.h
@@ -18,7 +18,8 @@
 // update if either the pref changes or if my_string_.SetValue is called.
 //
 // An optional observer can be passed into the Init method which can be used to
-// notify MyClass of changes.
+// notify MyClass of changes. Note that if you use SetValue(), the observer
+// will not be notified.
 
 #ifndef CHROME_COMMON_PREF_MEMBER_H_
 #define CHROME_COMMON_PREF_MEMBER_H_
diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc
index aaf54cc..1cc0f1c 100644
--- a/chrome/common/pref_names.cc
+++ b/chrome/common/pref_names.cc
@@ -201,6 +201,11 @@ const wchar_t kIpcDisabledMessages[] = L"ipc_log_disabled_messages";
 // visible on the toolbar.
 const wchar_t kShowHomeButton[] = L"browser.show_home_button";
 
+// A boolean pref set to true if the Page and Options menu buttons should be
+// visible on the toolbar. This is only used for Mac where the default is to
+// have these menu in the main menubar, not as buttons on the toolbar.
+const wchar_t kShowPageOptionsButtons[] = L"browser.show_page_options_buttons";
+
 // A string value which saves short list of recently user selected encodings
 // separated with comma punctuation mark.
 const wchar_t kRecentlySelectedEncoding[] =
diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h
index 53385fd..2dccc57 100644
--- a/chrome/common/pref_names.h
+++ b/chrome/common/pref_names.h
@@ -65,6 +65,7 @@ extern const wchar_t kDnsStartupPrefetchList[];
 extern const wchar_t kDnsHostReferralList[];
 extern const wchar_t kIpcDisabledMessages[];
 extern const wchar_t kShowHomeButton[];
+extern const wchar_t kShowPageOptionsButtons[];
 extern const wchar_t kRecentlySelectedEncoding[];
 extern const wchar_t kDeleteBrowsingHistory[];
 extern const wchar_t kDeleteDownloadHistory[];
diff --git a/chrome/common/temp_scaffolding_stubs.cc b/chrome/common/temp_scaffolding_stubs.cc
index 1eee578..b4d87c8 100644
--- a/chrome/common/temp_scaffolding_stubs.cc
+++ b/chrome/common/temp_scaffolding_stubs.cc
@@ -121,6 +121,7 @@ void AutomationProvider::OnMessageFromExternalHost(
 
 //--------------------------------------------------------------------------
 
+#if defined(OS_LINUX)
 bool ShellIntegration::SetAsDefaultBrowser() {
   NOTIMPLEMENTED();
   return true;
@@ -130,6 +131,7 @@ bool ShellIntegration::IsDefaultBrowser() {
   NOTIMPLEMENTED();
   return true;
 }
+#endif
 
 //--------------------------------------------------------------------------