Commit 48c32e4e authored by serya@chromium.org's avatar serya@chromium.org

Showing the promo on release channel only.

BUG=138954
TEST=


Review URL: https://chromiumcodereview.appspot.com/10829192

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@150297 0039d316-1c4b-4281-b951-d872f2087c98
parent 024217ae
...@@ -38,6 +38,7 @@ ...@@ -38,6 +38,7 @@
#include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/browser_window.h"
#include "chrome/browser/ui/views/select_file_dialog_extension.h" #include "chrome/browser/ui/views/select_file_dialog_extension.h"
#include "chrome/browser/ui/webui/extensions/extension_icon_source.h" #include "chrome/browser/ui/webui/extensions/extension_icon_source.h"
#include "chrome/common/chrome_version_info.h"
#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension.h"
#include "chrome/common/extensions/extension_icon_set.h" #include "chrome/common/extensions/extension_icon_set.h"
#include "chrome/common/extensions/file_browser_handler.h" #include "chrome/common/extensions/file_browser_handler.h"
...@@ -1723,6 +1724,9 @@ bool FileDialogStringsFunction::RunImpl() { ...@@ -1723,6 +1724,9 @@ bool FileDialogStringsFunction::RunImpl() {
board = "unknown"; board = "unknown";
dict->SetString(kMachineInfoBoard, board); dict->SetString(kMachineInfoBoard, board);
dict->SetString("BROWSER_VERSION_MODIFIER",
chrome::VersionInfo::GetVersionStringModifier());
return true; return true;
} }
......
...@@ -3991,7 +3991,9 @@ FileManager.prototype = { ...@@ -3991,7 +3991,9 @@ FileManager.prototype = {
FileManager.prototype.createGDataWelcomeHandler_ = function() { FileManager.prototype.createGDataWelcomeHandler_ = function() {
var board = str('CHROMEOS_RELEASE_BOARD'); var board = str('CHROMEOS_RELEASE_BOARD');
var new_welcome = board.match(/^(stumpy|lumpy)/i); // It is 'canary' or 'beta' for the other channels.
var releaseChannel = str('BROWSER_VERSION_MODIFIER') == '';
var new_welcome = board.match(/^(stumpy|lumpy)/i) && releaseChannel;
var WELCOME_HEADER_COUNTER_KEY = 'gdataWelcomeHeaderCounter'; var WELCOME_HEADER_COUNTER_KEY = 'gdataWelcomeHeaderCounter';
var WELCOME_HEADER_COUNTER_LIMIT = 5; var WELCOME_HEADER_COUNTER_LIMIT = 5;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment