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

Side by Side Diff: chrome/browser/ui/views/extensions/extension_message_bubble_view.cc

Issue 660873002: Use scoped_ptr::Pass instead of scoped_ptr::PassAs<T>. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 months 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
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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 "chrome/browser/ui/views/extensions/extension_message_bubble_view.h" 5 #include "chrome/browser/ui/views/extensions/extension_message_bubble_view.h"
6 6
7 #include "base/strings/string_number_conversions.h" 7 #include "base/strings/string_number_conversions.h"
8 #include "base/strings/string_util.h" 8 #include "base/strings/string_util.h"
9 #include "base/strings/utf_string_conversions.h" 9 #include "base/strings/utf_string_conversions.h"
10 #include "chrome/browser/extensions/dev_mode_bubble_controller.h" 10 #include "chrome/browser/extensions/dev_mode_bubble_controller.h"
(...skipping 341 matching lines...) Expand 10 before | Expand all | Expand 10 after
352 if (!extension) 352 if (!extension)
353 return false; 353 return false;
354 354
355 scoped_ptr<SettingsApiBubbleController> settings_api_bubble( 355 scoped_ptr<SettingsApiBubbleController> settings_api_bubble(
356 new SettingsApiBubbleController(profile_, 356 new SettingsApiBubbleController(profile_,
357 BUBBLE_TYPE_STARTUP_PAGES)); 357 BUBBLE_TYPE_STARTUP_PAGES));
358 if (!settings_api_bubble->ShouldShow(extension->id())) 358 if (!settings_api_bubble->ShouldShow(extension->id()))
359 return false; 359 return false;
360 360
361 shown_startup_override_extensions_bubble_ = true; 361 shown_startup_override_extensions_bubble_ = true;
362 PrepareToHighlightExtensions( 362 PrepareToHighlightExtensions(settings_api_bubble.Pass(), anchor_view);
363 settings_api_bubble.PassAs<ExtensionMessageBubbleController>(),
364 anchor_view);
365 return true; 363 return true;
366 #endif 364 #endif
367 } 365 }
368 366
369 bool ExtensionMessageBubbleFactory::MaybeShowProxyOverrideExtensionsBubble( 367 bool ExtensionMessageBubbleFactory::MaybeShowProxyOverrideExtensionsBubble(
370 views::View* anchor_view) { 368 views::View* anchor_view) {
371 #if !defined(OS_WIN) 369 #if !defined(OS_WIN)
372 return false; 370 return false;
373 #else 371 #else
374 DCHECK(!shown_proxy_override_extensions_bubble_); 372 DCHECK(!shown_proxy_override_extensions_bubble_);
375 373
376 const Extension* extension = GetExtensionOverridingProxy(profile_); 374 const Extension* extension = GetExtensionOverridingProxy(profile_);
377 if (!extension) 375 if (!extension)
378 return false; 376 return false;
379 377
380 scoped_ptr<ProxyOverriddenBubbleController> proxy_bubble( 378 scoped_ptr<ProxyOverriddenBubbleController> proxy_bubble(
381 new ProxyOverriddenBubbleController(profile_)); 379 new ProxyOverriddenBubbleController(profile_));
382 if (!proxy_bubble->ShouldShow(extension->id())) 380 if (!proxy_bubble->ShouldShow(extension->id()))
383 return false; 381 return false;
384 382
385 shown_proxy_override_extensions_bubble_ = true; 383 shown_proxy_override_extensions_bubble_ = true;
386 PrepareToHighlightExtensions( 384 PrepareToHighlightExtensions(proxy_bubble.Pass(), anchor_view);
387 proxy_bubble.PassAs<ExtensionMessageBubbleController>(), anchor_view);
388 return true; 385 return true;
389 #endif 386 #endif
390 } 387 }
391 388
392 bool ExtensionMessageBubbleFactory::MaybeShowDevModeExtensionsBubble( 389 bool ExtensionMessageBubbleFactory::MaybeShowDevModeExtensionsBubble(
393 views::View* anchor_view) { 390 views::View* anchor_view) {
394 DCHECK(!shown_dev_mode_extensions_bubble_); 391 DCHECK(!shown_dev_mode_extensions_bubble_);
395 392
396 // Check the Developer Mode extensions. 393 // Check the Developer Mode extensions.
397 scoped_ptr<DevModeBubbleController> dev_mode_extensions( 394 scoped_ptr<DevModeBubbleController> dev_mode_extensions(
398 new DevModeBubbleController(profile_)); 395 new DevModeBubbleController(profile_));
399 396
400 // Return early if we have none to show. 397 // Return early if we have none to show.
401 if (!dev_mode_extensions->ShouldShow()) 398 if (!dev_mode_extensions->ShouldShow())
402 return false; 399 return false;
403 400
404 shown_dev_mode_extensions_bubble_ = true; 401 shown_dev_mode_extensions_bubble_ = true;
405 PrepareToHighlightExtensions( 402 PrepareToHighlightExtensions(dev_mode_extensions.Pass(), anchor_view);
406 dev_mode_extensions.PassAs<ExtensionMessageBubbleController>(),
407 anchor_view);
408 return true; 403 return true;
409 } 404 }
410 405
411 void ExtensionMessageBubbleFactory::MaybeObserve() { 406 void ExtensionMessageBubbleFactory::MaybeObserve() {
412 if (!is_observing_) { 407 if (!is_observing_) {
413 is_observing_ = true; 408 is_observing_ = true;
414 container_->AddObserver(this); 409 container_->AddObserver(this);
415 } 410 }
416 } 411 }
417 412
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
504 } 499 }
505 500
506 void ExtensionMessageBubbleFactory::Finish() { 501 void ExtensionMessageBubbleFactory::Finish() {
507 MaybeStopObserving(); 502 MaybeStopObserving();
508 controller_.reset(); 503 controller_.reset();
509 anchor_view_ = NULL; 504 anchor_view_ = NULL;
510 container_ = NULL; 505 container_ = NULL;
511 } 506 }
512 507
513 } // namespace extensions 508 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/browser/sync_file_system/remote_file_sync_service.cc ('k') | chrome/browser/undo/undo_manager_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698