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

Side by Side Diff: chrome/browser/ui/views/first_run_bubble.cc

Issue 8493011: Merge 108537 - Align avatar bubble with edge of anchor control (Closed) Base URL: svn://svn.chromium.org/chrome/branches/912/src/
Patch Set: Created 9 years, 1 month 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/first_run_bubble.h" 5 #include "chrome/browser/ui/views/first_run_bubble.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/utf_string_conversions.h" 8 #include "base/utf_string_conversions.h"
9 #include "chrome/browser/first_run/first_run.h" 9 #include "chrome/browser/first_run/first_run.h"
10 #include "chrome/browser/search_engines/util.h" 10 #include "chrome/browser/search_engines/util.h"
(...skipping 492 matching lines...) Expand 10 before | Expand all | Expand 10 after
503 view = new FirstRunBubbleView(bubble, profile); 503 view = new FirstRunBubbleView(bubble, profile);
504 break; 504 break;
505 case FirstRun::MINIMAL_BUBBLE: 505 case FirstRun::MINIMAL_BUBBLE:
506 view = new FirstRunMinimalBubbleView(bubble, profile); 506 view = new FirstRunMinimalBubbleView(bubble, profile);
507 break; 507 break;
508 default: 508 default:
509 NOTREACHED(); 509 NOTREACHED();
510 } 510 }
511 bubble->set_view(view); 511 bubble->set_view(view);
512 bubble->InitBubble( 512 bubble->InitBubble(
513 parent, position_relative_to, arrow_location, view, bubble); 513 parent, position_relative_to, arrow_location,
514 views::BubbleBorder::ALIGN_ARROW_TO_MID_ANCHOR, view, bubble);
514 bubble->GetWidget()->GetFocusManager()->AddFocusChangeListener(view); 515 bubble->GetWidget()->GetFocusManager()->AddFocusChangeListener(view);
515 view->BubbleShown(); 516 view->BubbleShown();
516 return bubble; 517 return bubble;
517 } 518 }
518 519
519 FirstRunBubble::FirstRunBubble() 520 FirstRunBubble::FirstRunBubble()
520 : has_been_activated_(false), 521 : has_been_activated_(false),
521 ALLOW_THIS_IN_INITIALIZER_LIST(enable_window_method_factory_(this)), 522 ALLOW_THIS_IN_INITIALIZER_LIST(enable_window_method_factory_(this)),
522 view_(NULL) { 523 view_(NULL) {
523 } 524 }
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
569 if (::IsWindowEnabled(GetParent())) 570 if (::IsWindowEnabled(GetParent()))
570 Bubble::OnActivate(action, minimized, window); 571 Bubble::OnActivate(action, minimized, window);
571 } 572 }
572 #endif 573 #endif
573 574
574 void FirstRunBubble::BubbleClosing(Bubble* bubble, bool closed_by_escape) { 575 void FirstRunBubble::BubbleClosing(Bubble* bubble, bool closed_by_escape) {
575 // Make sure our parent window is re-enabled. 576 // Make sure our parent window is re-enabled.
576 if (!IsWindowEnabled(GetParent())) 577 if (!IsWindowEnabled(GetParent()))
577 ::EnableWindow(GetParent(), true); 578 ::EnableWindow(GetParent(), true);
578 } 579 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/extensions/extension_installed_bubble.cc ('k') | chrome/browser/ui/views/frame/browser_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698