Merge pull request #2038 from cezaraugusto/feature-disable-title-mode

Always show URL bar. closes #1984
brave · Jun 6, 2016 · ac97957 · ac97957
2 parents 2b8f452 + 85c6ecc
commit ac97957
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 2 deletions.
diff --git a/app/extensions/brave/locales/en-US/preferences.properties b/app/extensions/brave/locales/en-US/preferences.properties
@@ -77,3 +77,4 @@ alwaysAllow=Always allow
 alwaysDeny=Always deny
 appearanceSettings=Appearance settings
 autoHideMenuBar=Hide the menu bar by default
+disableTitleMode=Always show URL bar
diff --git a/js/about/preferences.js b/js/about/preferences.js
@@ -138,6 +138,7 @@ class GeneralTab extends ImmutableComponent {
         {
           isDarwin ? null : <SettingCheckbox dataL10nId='autoHideMenuBar' prefKey={settings.AUTO_HIDE_MENU} settings={this.props.settings} onChangeSetting={this.props.onChangeSetting} />
         }
+        <SettingCheckbox dataL10nId='disableTitleMode' prefKey={settings.DISABLE_TITLE_MODE} settings={this.props.settings} onChangeSetting={this.props.onChangeSetting} />
       </SettingsList>
     </SettingsList>
   }

diff --git a/js/components/navigationBar.js b/js/components/navigationBar.js
@@ -77,7 +77,8 @@ class NavigationBar extends ImmutableComponent {
       !['about:blank', 'about:newtab'].includes(this.props.activeFrame.get('location')) &&
       !this.loading &&
       !this.props.navbar.getIn(['urlbar', 'focused']) &&
-      !this.props.navbar.getIn(['urlbar', 'active'])
+      !this.props.navbar.getIn(['urlbar', 'active']) &&
+      getSetting(settings.DISABLE_TITLE_MODE) === false
   }
 
   componentDidMount () {

diff --git a/js/constants/appConfig.js b/js/constants/appConfig.js
@@ -95,6 +95,7 @@ module.exports = {
     'security.passwords.manager-enabled': true,
     'security.passwords.one-password-enabled': false,
     'security.passwords.dashlane-enabled': false,
-    'general.downloads.default-save-path': null
+    'general.downloads.default-save-path': null,
+    'general.disable-title-mode': process.platform === 'win32'
   }
 }
diff --git a/js/constants/settings.js b/js/constants/settings.js
@@ -10,6 +10,7 @@ const settings = {
   USERAGENT: 'general.useragent.value',
   DEFAULT_DOWNLOAD_SAVE_PATH: 'general.downloads.default-save-path',
   AUTO_HIDE_MENU: 'general.autohide-menu',
+  DISABLE_TITLE_MODE: 'general.disable-title-mode',
   // Search tab
   DEFAULT_SEARCH_ENGINE: 'search.default-search-engine',
   // Tabs tab