| Index: chrome/browser/ui/browser.h
|
| diff --git a/chrome/browser/ui/browser.h b/chrome/browser/ui/browser.h
|
| index 693e84d96148a486101ae1a1e7ed6401e516c791..5e1b379774e0367a1b400ed6afef40ae08ec1e24 100644
|
| --- a/chrome/browser/ui/browser.h
|
| +++ b/chrome/browser/ui/browser.h
|
| @@ -35,7 +35,6 @@
|
| #include "components/content_settings/core/common/content_settings.h"
|
| #include "components/content_settings/core/common/content_settings_types.h"
|
| #include "components/prefs/pref_change_registrar.h"
|
| -#include "components/prefs/pref_member.h"
|
| #include "components/sessions/core/session_id.h"
|
| #include "components/toolbar/toolbar_model.h"
|
| #include "components/translate/content/browser/content_translate_driver.h"
|
| @@ -387,11 +386,6 @@ class Browser : public TabStripModelObserver,
|
| // in |SupportsWindowFeature| for details on this.
|
| bool CanSupportWindowFeature(WindowFeature feature) const;
|
|
|
| - // TODO(port): port these, and re-merge the two function declaration lists.
|
| - // Page-related commands.
|
| - void ToggleEncodingAutoDetect();
|
| - void OverrideEncoding(int encoding_id);
|
| -
|
| // Show various bits of UI
|
| void OpenFile();
|
|
|
| @@ -963,9 +957,6 @@ class Browser : public TabStripModelObserver,
|
| // Dialog box used for opening and saving files.
|
| scoped_refptr<ui::SelectFileDialog> select_file_dialog_;
|
|
|
| - // Keep track of the encoding auto detect pref.
|
| - BooleanPrefMember encoding_auto_detect_;
|
| -
|
| // Helper which implements the ContentSettingBubbleModel interface.
|
| std::unique_ptr<BrowserContentSettingBubbleModelDelegate>
|
| content_setting_bubble_model_delegate_;
|
|
|