Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(52)

Side by Side Diff: chrome/browser/extensions/script_badge_controller_unittest.cc

Issue 11411308: Enable script bubble by default on all but mac. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Everything passes Created 8 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include <string> 5 #include <string>
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "base/message_loop.h" 9 #include "base/message_loop.h"
10 #include "base/stringprintf.h" 10 #include "base/stringprintf.h"
(...skipping 185 matching lines...) Expand 10 before | Expand all | Expand 10 after
196 CountingNotificationObserver location_bar_updated; 196 CountingNotificationObserver location_bar_updated;
197 notification_registrar.Add( 197 notification_registrar.Add(
198 &location_bar_updated, 198 &location_bar_updated,
199 chrome::NOTIFICATION_EXTENSION_LOCATION_BAR_UPDATED, 199 chrome::NOTIFICATION_EXTENSION_LOCATION_BAR_UPDATED,
200 content::Source<Profile>(profile)); 200 content::Source<Profile>(profile));
201 201
202 Reload(); 202 Reload();
203 203
204 EXPECT_THAT(script_badge_controller_->GetCurrentActions(), 204 EXPECT_THAT(script_badge_controller_->GetCurrentActions(),
205 testing::ElementsAre()); 205 testing::ElementsAre());
206
207 // Should be zero, but ScriptBubbleController notifies updates via
208 // LocationBarController and causes an update here.
209 #if defined(OS_MACOSX)
210 // Not enabled on mac yet
206 EXPECT_EQ(0, location_bar_updated.events); 211 EXPECT_EQ(0, location_bar_updated.events);
212 #else
213 EXPECT_EQ(1, location_bar_updated.events);
214 #endif
207 } 215 }
208 } 216 }
209 217
210 TEST_F(ScriptBadgeControllerTest, GetAttentionMakesBadgeVisible) { 218 TEST_F(ScriptBadgeControllerTest, GetAttentionMakesBadgeVisible) {
211 content::NotificationRegistrar notification_registrar; 219 content::NotificationRegistrar notification_registrar;
212 220
213 scoped_refptr<const Extension> extension = 221 scoped_refptr<const Extension> extension =
214 ExtensionBuilder() 222 ExtensionBuilder()
215 .SetManifest(DictionaryBuilder() 223 .SetManifest(DictionaryBuilder()
216 .Set("name", "Extension") 224 .Set("name", "Extension")
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
252 // Getting attention a second time should have no effect. 260 // Getting attention a second time should have no effect.
253 script_badge_controller_->GetAttentionFor(extension->id()); 261 script_badge_controller_->GetAttentionFor(extension->id());
254 262
255 EXPECT_THAT(script_badge_controller_->GetCurrentActions(), 263 EXPECT_THAT(script_badge_controller_->GetCurrentActions(),
256 testing::ElementsAre(GetScriptBadge(*extension))); 264 testing::ElementsAre(GetScriptBadge(*extension)));
257 EXPECT_EQ(0, subsequent_get_attention_call.events); 265 EXPECT_EQ(0, subsequent_get_attention_call.events);
258 }; 266 };
259 267
260 } // namespace 268 } // namespace
261 } // namespace extensions 269 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/browser/extensions/page_action_controller.cc ('k') | chrome/browser/extensions/script_bubble_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698