| Index: chrome/browser/browser.cc
|
| diff --git a/chrome/browser/browser.cc b/chrome/browser/browser.cc
|
| index c3a320a183f2e69eb57fa1c38204830558f659d1..32a93c0d3739e416a5aa413ca3addedd6fd4902a 100644
|
| --- a/chrome/browser/browser.cc
|
| +++ b/chrome/browser/browser.cc
|
| @@ -62,6 +62,9 @@
|
| #include "chrome/browser/platform_util.h"
|
| #include "chrome/browser/pref_service.h"
|
| #include "chrome/browser/profile.h"
|
| +#if defined(ENABLE_REMOTING)
|
| +#include "chrome/browser/remoting/setup.h"
|
| +#endif
|
| #include "chrome/browser/renderer_host/render_view_host.h"
|
| #include "chrome/browser/renderer_host/site_instance.h"
|
| #include "chrome/browser/sessions/session_service.h"
|
| @@ -1069,6 +1072,13 @@ void Browser::UpdateCommandsForFullscreenMode(bool is_fullscreen) {
|
| command_updater_.UpdateCommandEnabled(IDC_IMPORT_SETTINGS, show_main_ui);
|
| command_updater_.UpdateCommandEnabled(IDC_SYNC_BOOKMARKS,
|
| show_main_ui && profile_->IsSyncAccessible());
|
| +
|
| +#if defined(ENABLE_REMOTING)
|
| + if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableRemoting)) {
|
| + command_updater_.UpdateCommandEnabled(IDC_REMOTING_SETUP, show_main_ui);
|
| + }
|
| +#endif
|
| +
|
| command_updater_.UpdateCommandEnabled(IDC_OPTIONS, show_main_ui);
|
| command_updater_.UpdateCommandEnabled(IDC_EDIT_SEARCH_ENGINES, show_main_ui);
|
| command_updater_.UpdateCommandEnabled(IDC_VIEW_PASSWORDS, show_main_ui);
|
| @@ -1819,6 +1829,12 @@ void Browser::OpenSyncMyBookmarksDialog() {
|
| profile_, ProfileSyncService::START_FROM_WRENCH);
|
| }
|
|
|
| +#if defined(ENABLE_REMOTING)
|
| +void Browser::OpenRemotingSetupDialog() {
|
| + remoting_setup::OpenRemotingSetupDialog(profile_);
|
| +}
|
| +#endif
|
| +
|
| void Browser::OpenAboutChromeDialog() {
|
| UserMetrics::RecordAction(UserMetricsAction("AboutChrome"), profile_);
|
| window_->ShowAboutChromeDialog();
|
| @@ -2111,6 +2127,9 @@ void Browser::ExecuteCommandWithDisposition(
|
| case IDC_SHOW_DOWNLOADS: ShowDownloadsTab(); break;
|
| case IDC_MANAGE_EXTENSIONS: ShowExtensionsTab(); break;
|
| case IDC_SYNC_BOOKMARKS: OpenSyncMyBookmarksDialog(); break;
|
| +#if defined(ENABLE_REMOTING)
|
| + case IDC_REMOTING_SETUP: OpenRemotingSetupDialog(); break;
|
| +#endif
|
| case IDC_OPTIONS: OpenOptionsDialog(); break;
|
| case IDC_EDIT_SEARCH_ENGINES: OpenKeywordEditor(); break;
|
| case IDC_VIEW_PASSWORDS: OpenPasswordManager(); break;
|
|
|