diff options
| author | erikchen@google.com <erikchen@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-06 23:50:37 +0000 |
|---|---|---|
| committer | erikchen@google.com <erikchen@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-06 23:50:37 +0000 |
| commit | c21714a74c8fb196b0003bbebb9f8026bec00bb2 (patch) | |
| tree | 79450ba9f25cbfe1674dcadd7463af98d65813a5 /chrome/browser/browser.cc | |
| parent | 8a15f0149b7ccd709574151ce7eeb1add16e7cc7 (diff) | |
| download | chromium_src-c21714a74c8fb196b0003bbebb9f8026bec00bb2.zip chromium_src-c21714a74c8fb196b0003bbebb9f8026bec00bb2.tar.gz chromium_src-c21714a74c8fb196b0003bbebb9f8026bec00bb2.tar.bz2 | |
Revert 55311 - Add remoting to wrench menu.
This change adds remoting item to wrench menu.
The change is under flag enable-remoting, so end users will not see it.
The CL is cleaned up. It was compiling and working. I added the check for kEnableRemoting and resynched and it is no longer compiling.
Submitted for: pranavk@chromium.org
Reviewed: http://codereview.chromium.org/3075024/show
BUG=50242
TEST=NONE
Review URL: http://codereview.chromium.org/3080038
TBR=hclam@chromium.org
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55316 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser.cc')
| -rw-r--r-- | chrome/browser/browser.cc | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/chrome/browser/browser.cc b/chrome/browser/browser.cc index ad9ff16..f53ab1d 100644 --- a/chrome/browser/browser.cc +++ b/chrome/browser/browser.cc @@ -61,9 +61,6 @@ #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" @@ -1071,13 +1068,6 @@ 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); @@ -1828,12 +1818,6 @@ 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(); @@ -2126,9 +2110,6 @@ 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; |