summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoralemate@chromium.org <alemate@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-08 17:59:03 +0000
committeralemate@chromium.org <alemate@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-08 17:59:03 +0000
commitcdb0fa43385425dd7e8d98e1fe7750259ac75b3e (patch)
tree3efea345d3645068ec06ab6651ce1e11befb9bbb
parentb3988a9ec5295981bdc9de026056b857e028819a (diff)
downloadchromium_src-cdb0fa43385425dd7e8d98e1fe7750259ac75b3e.zip
chromium_src-cdb0fa43385425dd7e8d98e1fe7750259ac75b3e.tar.gz
chromium_src-cdb0fa43385425dd7e8d98e1fe7750259ac75b3e.tar.bz2
Revert of Add error messsage bubble flag for tests. (https://codereview.chromium.org/268373002/)
Reason for revert: Win tests are failing. Reverting to check if this CL is to blame. Original issue's description: > Add error messsage bubble flag for tests. > > Tests checking for eroro message buble can be flaky, because on-screen message > can disappear before test checks for it. This CL adds special flag for tests. > > BUG=339348 > > Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=268924 TBR=antrim@chromium.org,achuith@chromium.org NOTREECHECKS=true NOTRY=true BUG=339348 Review URL: https://codereview.chromium.org/271823005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@269072 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/resources/login/display_manager.js10
1 files changed, 1 insertions, 9 deletions
diff --git a/chrome/browser/resources/login/display_manager.js b/chrome/browser/resources/login/display_manager.js
index d611267..3644beb1 100644
--- a/chrome/browser/resources/login/display_manager.js
+++ b/chrome/browser/resources/login/display_manager.js
@@ -178,11 +178,6 @@ cr.define('cr.ui.login', function() {
*/
displayType_: DISPLAY_TYPE.UNKNOWN,
- /**
- * Error message (bubble) was shown. This is checked in tests.
- */
- errorMessageWasShownForTesting_: false,
-
get displayType() {
return this.displayType_;
},
@@ -881,10 +876,8 @@ cr.define('cr.ui.login', function() {
}
var currentScreen = Oobe.getInstance().currentScreen;
- if (currentScreen && typeof currentScreen.showErrorBubble === 'function') {
+ if (currentScreen && typeof currentScreen.showErrorBubble === 'function')
currentScreen.showErrorBubble(loginAttempts, error);
- this.errorMessageWasShownForTesting_ = true;
- }
};
/**
@@ -914,7 +907,6 @@ cr.define('cr.ui.login', function() {
*/
DisplayManager.clearErrors = function() {
$('bubble').hide();
- this.errorMessageWasShownForTesting_ = false;
};
/**