summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--chrome/app/chrome_dll_resource.h3
-rw-r--r--chrome/app/generated_resources.grd16
-rw-r--r--chrome/browser/browser.cc19
-rw-r--r--chrome/browser/browser.h3
-rw-r--r--chrome/browser/remoting/setup.cc21
-rw-r--r--chrome/browser/remoting/setup.h19
-rw-r--r--chrome/browser/remoting/setup_flow.cc128
-rw-r--r--chrome/browser/remoting/setup_flow.h103
-rw-r--r--chrome/browser/wrench_menu_model.cc8
-rw-r--r--chrome/chrome_browser.gypi4
10 files changed, 0 insertions, 324 deletions
diff --git a/chrome/app/chrome_dll_resource.h b/chrome/app/chrome_dll_resource.h
index 9022381..6a9b539 100644
--- a/chrome/app/chrome_dll_resource.h
+++ b/chrome/app/chrome_dll_resource.h
@@ -234,9 +234,6 @@
#define IDC_WRITING_DIRECTION_LTR 41122 // OSX only
#define IDC_WRITING_DIRECTION_RTL 41123 // OSX only
-// Remoting
-#define IDC_REMOTING_SETUP 41140
-
// Translate
#define IDC_TRANSLATE_OPTIONS_ALWAYS 42000
#define IDC_TRANSLATE_OPTIONS_NEVER_TRANSLATE_LANG 42001
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index c1d874c..b3d76cf 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -6906,22 +6906,6 @@ Keep your key file in a safe place. You will need it to create new versions of y
<message name="IDS_OMNIBOX_SEARCH_HINT_OMNIBOX_TEXT" desc="The text displayed selected in the omnibox once the user clicked the 'Show Me' button on the omnibox search hint infobar.">
Type your search query here
</message>
-
- <!-- Remotin strings -->
- <if expr="not pp_ifdef('use_titlecase')">
- <message name="IDS_REMOTING_SETUP_LABEL" desc="The label that appears on the remoting setup menu.">
- Set up remoting...
- </message>
- </if>
- <if expr="pp_ifdef('use_titlecase')">
- <message name="IDS_REMOTING_SETUP_LABEL" desc="In Title Case. The label that appears on the remoting setup menu.">
- Set Up Remoting...
- </message>
- </if>
- <message name="IDS_REMOTING_SETUP_DIALOG_TITLE" desc="Title of the remoting setup dialog.">
- Set up remoting
- </message>
-
<!-- Sync strings -->
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;
diff --git a/chrome/browser/browser.h b/chrome/browser/browser.h
index 0d98c3f..2fc5d61 100644
--- a/chrome/browser/browser.h
+++ b/chrome/browser/browser.h
@@ -516,9 +516,6 @@ class Browser : public TabStripModelDelegate,
void OpenKeywordEditor();
void OpenPasswordManager();
void OpenSyncMyBookmarksDialog();
-#if defined(ENABLE_REMOTING)
- void OpenRemotingSetupDialog();
-#endif
void OpenImportSettingsDialog();
void OpenAboutChromeDialog();
void OpenUpdateChromeDialog();
diff --git a/chrome/browser/remoting/setup.cc b/chrome/browser/remoting/setup.cc
deleted file mode 100644
index e8e27c3..0000000
--- a/chrome/browser/remoting/setup.cc
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "chrome/browser/remoting/setup.h"
-#include "chrome/browser/remoting/setup_flow.h"
-
-//#include "app/l10n_util.h"
-//#include "base/utf_string_conversions.h"
-#include "chrome/browser/google_service_auth_error.h"
-#include "chrome/browser/profile.h"
-
-typedef GoogleServiceAuthError AuthError;
-
-namespace remoting_setup {
-
-void OpenRemotingSetupDialog(Profile* profile) {
- remoting_setup::SetupFlow::Run(profile->GetOriginalProfile());
-}
-
-} // namespace sync_ui_util
diff --git a/chrome/browser/remoting/setup.h b/chrome/browser/remoting/setup.h
deleted file mode 100644
index a365647..0000000
--- a/chrome/browser/remoting/setup.h
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef CHROME_BROWSER_REMOTING_SETUP_H_
-#define CHROME_BROWSER_REMOTING_SETUP_H_
-
-#include "base/string16.h"
-
-class Profile;
-
-namespace remoting_setup {
-
-// Open the appropriate setup dialog for the given profile (which can be
-// incognito).
-void OpenRemotingSetupDialog(Profile* profile);
-} // namespace remoting_setup
-
-#endif // CHROME_BROWSER_REMOTING_SETUP_H_
diff --git a/chrome/browser/remoting/setup_flow.cc b/chrome/browser/remoting/setup_flow.cc
deleted file mode 100644
index 6bd0cad..0000000
--- a/chrome/browser/remoting/setup_flow.cc
+++ /dev/null
@@ -1,128 +0,0 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "chrome/browser/remoting/setup_flow.h"
-
-#include "app/gfx/font_util.h"
-#include "base/callback.h"
-#include "base/histogram.h"
-#include "base/json/json_reader.h"
-#include "base/json/json_writer.h"
-#include "base/string_util.h"
-#include "base/utf_string_conversions.h"
-#include "base/values.h"
-#include "chrome/browser/browser.h"
-#include "chrome/browser/browser_list.h"
-#if defined(OS_MACOSX)
-#include "chrome/browser/cocoa/html_dialog_window_controller_cppsafe.h"
-#endif
-#include "chrome/browser/dom_ui/dom_ui_util.h"
-#include "chrome/browser/google_service_auth_error.h"
-#include "chrome/browser/platform_util.h"
-#include "chrome/browser/pref_service.h"
-#include "chrome/browser/profile.h"
-#include "chrome/browser/renderer_host/render_view_host.h"
-#include "chrome/browser/tab_contents/tab_contents.h"
-#include "chrome/common/pref_names.h"
-#include "gfx/font.h"
-#include "grit/locale_settings.h"
-
-namespace remoting_setup {
-
-// Use static Run method to get an instance.
-SetupFlow::SetupFlow(const std::string& args, Profile* profile)
- : dialog_start_args_(args),
- profile_(profile) {
-}
-
-SetupFlow::~SetupFlow() {
-}
-
-void SetupFlow::GetDialogSize(gfx::Size* size) const {
- PrefService* prefs = profile_->GetPrefs();
- gfx::Font approximate_web_font = gfx::Font::CreateFont(
- UTF8ToWide(prefs->GetString(prefs::kWebKitSansSerifFontFamily)),
- prefs->GetInteger(prefs::kWebKitDefaultFontSize));
-
- // TODO(pranavk) Replace the following SYNC resources with REMOTING Resources.
- *size = gfx::GetLocalizedContentsSizeForFont(
- IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS,
- IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES,
- approximate_web_font);
-
-#if defined(OS_MACOSX)
- // NOTE(pranavk): This is a hack to work around a problem with font height on
- // windows. Basically font metrics are incorrectly returned in logical units
- // instead of pixels on Windows. Logical units are very commonly 96 DPI
- // so our localized char/line counts are too small by a factor of 96/72.
- // So we compensate for this on non-windows platform.
- //
- // TODO(pranavk): Remove this hack once we fix the windows font problem (or at
- // least work around it in some other place).
- float scale_hack = 96.f/72.f;
- size->set_width(size->width() * scale_hack);
- size->set_height(size->height() * scale_hack);
-#endif
-}
-
-// A callback to notify the delegate that the dialog closed.
-void SetupFlow::OnDialogClosed(const std::string& json_retval) {
- delete this;
-}
-
-// static
-void SetupFlow::GetArgsForGaiaLogin(DictionaryValue* args) {
- // TODO(pranavk): implement this method.
-}
-
-void SetupFlow::GetDOMMessageHandlers(
- std::vector<DOMMessageHandler*>* handlers) const {
- // TODO(pranavk): implement this method.
-}
-
-
-void SetupFlow::Advance() {
- // TODO(pranavk): implement this method.
-}
-
-void SetupFlow::Focus() {
-#if defined(OS_MACOSX)
- if (html_dialog_window_) {
- platform_util::ActivateWindow(html_dialog_window_);
- }
-#else
- // TODO(pranavk): We don't currently have a way to get the reference to the
- // dialog on windows/linux. This can be resolved by a cross platform
- // implementation of HTML dialogs as described below.
- NOTIMPLEMENTED();
-#endif // defined(OS_MACOSX)
-}
-
-// static
-SetupFlow* SetupFlow::Run(Profile* service) {
- DictionaryValue args;
- std::string json_args;
- base::JSONWriter::Write(&args, false, &json_args);
-
- SetupFlow* flow = new SetupFlow(json_args, service);
-#if defined(OS_MACOSX)
- // TODO(pranavk): Figure out a cleaner way to do this than to have this
- // gross per-OS behavior, i.e. have a cross-platform ShowHtmlDialog()
- // function that is not tied to a browser instance.
- flow->html_dialog_window_ =
- html_dialog_window_controller::ShowHtmlDialog(
- flow, service->profile());
-#else
- Browser* b = BrowserList::GetLastActive();
- if (b) {
- b->BrowserShowHtmlDialog(flow, NULL);
- } else {
- delete flow;
- return NULL;
- }
-#endif // defined(OS_MACOSX)
- return flow;
-}
-
-} // namespace remoting_setup
diff --git a/chrome/browser/remoting/setup_flow.h b/chrome/browser/remoting/setup_flow.h
deleted file mode 100644
index dd33c55..0000000
--- a/chrome/browser/remoting/setup_flow.h
+++ /dev/null
@@ -1,103 +0,0 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef CHROME_BROWSER_REMOTING_SETUP_FLOW_H_
-#define CHROME_BROWSER_REMOTING_SETUP_FLOW_H_
-
-#include <string>
-#include <vector>
-
-#include "app/l10n_util.h"
-#include "base/time.h"
-#include "chrome/browser/dom_ui/html_dialog_ui.h"
-#include "gfx/native_widget_types.h"
-#include "grit/generated_resources.h"
-
-namespace remoting_setup {
-
-// The state machine used by Remoting for setup wizard.
-class SetupFlow : public HtmlDialogUIDelegate {
- public:
- virtual ~SetupFlow();
-
- // Runs a flow from |start| to |end|, and does the work of actually showing
- // the HTML dialog. |container| is kept up-to-date with the lifetime of the
- // flow (e.g it is emptied on dialog close).
- static SetupFlow* Run(Profile* service);
-
- // Fills |args| with "user" and "error" arguments by querying |service|.
- static void GetArgsForGaiaLogin(DictionaryValue* args);
-
- // Triggers a state machine transition to advance_state.
- void Advance();
-
- // Focuses the dialog. This is useful in cases where the dialog has been
- // obscured by a browser window.
- void Focus();
-
- // HtmlDialogUIDelegate implementation.
- // Get the HTML file path for the content to load in the dialog.
- virtual GURL GetDialogContentURL() const {
- return GURL("chrome://remotingresources/setup");
- }
-
- // HtmlDialogUIDelegate implementation.
- virtual void GetDOMMessageHandlers(
- std::vector<DOMMessageHandler*>* handlers) const;
-
- // HtmlDialogUIDelegate implementation.
- // Get the size of the dialog.
- virtual void GetDialogSize(gfx::Size* size) const;
-
- // HtmlDialogUIDelegate implementation.
- // Gets the JSON string input to use when opening the dialog.
- virtual std::string GetDialogArgs() const {
- return dialog_start_args_;
- }
-
- // HtmlDialogUIDelegate implementation.
- // A callback to notify the delegate that the dialog closed.
- virtual void OnDialogClosed(const std::string& json_retval);
-
- // HtmlDialogUIDelegate implementation.
- virtual void OnCloseContents(TabContents* source, bool* out_close_dialog) { }
-
- // HtmlDialogUIDelegate implementation.
- virtual std::wstring GetDialogTitle() const {
- return l10n_util::GetString(IDS_REMOTING_SETUP_DIALOG_TITLE);
- }
-
- // HtmlDialogUIDelegate implementation.
- virtual bool IsDialogModal() const {
- return false;
- }
-
- void OnUserClickedCustomize() {
- // TODO(pranavk): Implement this method.
- }
-
- bool ClickCustomizeOk() {
- // TODO(pranavk): Implement this method.
- return true;
- }
-
- void ClickCustomizeCancel() {
- // TODO(pranavk): Implement this method.
- }
-
- private:
-
- // Use static Run method to get an instance.
- SetupFlow(const std::string& args, Profile* profile);
-
- DISALLOW_COPY_AND_ASSIGN(SetupFlow);
-
- std::string dialog_start_args_; // The args to pass to the initial page.
-
- Profile* profile_;
-};
-
-} // namespace remoting_setup
-
-#endif // CHROME_BROWSER_REMOTING_SETUP_FLOW_H_
diff --git a/chrome/browser/wrench_menu_model.cc b/chrome/browser/wrench_menu_model.cc
index d4b576f..367b700 100644
--- a/chrome/browser/wrench_menu_model.cc
+++ b/chrome/browser/wrench_menu_model.cc
@@ -10,7 +10,6 @@
#include "app/l10n_util.h"
#include "app/menus/button_menu_item_model.h"
#include "app/resource_bundle.h"
-#include "base/command_line.h"
#include "base/string_number_conversions.h"
#include "chrome/app/chrome_dll_resource.h"
#include "chrome/browser/browser.h"
@@ -23,7 +22,6 @@
#include "chrome/browser/sync/sync_ui_util.h"
#include "chrome/browser/tab_contents/tab_contents.h"
#include "chrome/browser/upgrade_detector.h"
-#include "chrome/common/chrome_switches.h"
#include "chrome/common/notification_service.h"
#include "chrome/common/notification_source.h"
#include "chrome/common/notification_type.h"
@@ -300,12 +298,6 @@ void WrenchMenuModel::Build() {
tools_menu_model_.get());
AddSeparator();
-#if defined(ENABLE_REMOTING)
- if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableRemoting)) {
- AddItem(IDC_REMOTING_SETUP,
- l10n_util::GetStringUTF16(IDS_REMOTING_SETUP_LABEL));
- }
-#endif
AddItemWithStringId(IDC_SHOW_BOOKMARK_MANAGER, IDS_BOOKMARK_MANAGER);
AddItemWithStringId(IDC_SHOW_HISTORY, IDS_SHOW_HISTORY);
AddItemWithStringId(IDC_SHOW_DOWNLOADS, IDS_SHOW_DOWNLOADS);
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 5b19a56..5e992cd 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -2138,10 +2138,6 @@
'browser/profile_import_process_host.h',
'browser/profile_manager.cc',
'browser/profile_manager.h',
- 'browser/remoting/setup.cc',
- 'browser/remoting/setup.h',
- 'browser/remoting/setup_flow.cc',
- 'browser/remoting/setup_flow.h',
'browser/remove_rows_table_model.h',
'browser/renderer_host/async_resource_handler.cc',
'browser/renderer_host/async_resource_handler.h',
generated by cgit v1.1 at 2025-01-30 12:31:23 +0000