Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / ui / views / examples / bubble_example.cc

diff --git a/src/ui/views/examples/bubble_example.cc b/src/ui/views/examples/bubble_example.cc
index 6869b46..49a60e5 100644 (file)
--- a/src/ui/views/examples/bubble_example.cc
+++ b/src/ui/views/examples/bubble_example.cc
@@ -11,6 +11,8 @@
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/widget/widget.h"
 
+using base::ASCIIToUTF16;
+
 namespace views {
 namespace examples {
 
@@ -26,7 +28,7 @@ BubbleBorder::Arrow arrows[] = {
     BubbleBorder::BOTTOM_LEFT, BubbleBorder::LEFT_BOTTOM,
     BubbleBorder::LEFT_CENTER, BubbleBorder::LEFT_TOP };
 
-string16 GetArrowName(BubbleBorder::Arrow arrow) {
+base::string16 GetArrowName(BubbleBorder::Arrow arrow) {
   switch (arrow) {
     case BubbleBorder::TOP_LEFT:      return ASCIIToUTF16("TOP_LEFT");
     case BubbleBorder::TOP_RIGHT:     return ASCIIToUTF16("TOP_RIGHT");
@@ -81,8 +83,6 @@ void BubbleExample::CreateExampleView(View* container) {
   container->AddChildView(align_to_edge_);
   persistent_ = new LabelButton(this, ASCIIToUTF16("Persistent"));
   container->AddChildView(persistent_);
-  fade_in_ = new LabelButton(this, ASCIIToUTF16("Fade In"));
-  container->AddChildView(fade_in_);
 }
 
 void BubbleExample::ButtonPressed(Button* sender, const ui::Event& event) {
@@ -105,19 +105,14 @@ void BubbleExample::ButtonPressed(Button* sender, const ui::Event& event) {
   else if (sender == small_shadow_)
     bubble->set_shadow(BubbleBorder::SMALL_SHADOW);
 
-  if (sender == persistent_) {
+  if (sender == persistent_)
     bubble->set_close_on_deactivate(false);
-    bubble->set_move_with_anchor(true);
-  }
 
   BubbleDelegateView::CreateBubble(bubble);
   if (sender == align_to_edge_)
     bubble->SetAlignment(BubbleBorder::ALIGN_EDGE_TO_ANCHOR_EDGE);
 
-  if (sender == fade_in_)
-    bubble->StartFade(true);
-  else
-    bubble->GetWidget()->Show();
+  bubble->GetWidget()->Show();
 }
 
 }  // namespace examples