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

Side by Side Diff: chrome/browser/ui/views/sync/one_click_signin_bubble_view.cc

Issue 23531053: ui/base/animation -> ui/gfx/animation (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge 2 trunk Created 7 years, 3 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 | 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 "chrome/browser/ui/views/sync/one_click_signin_bubble_view.h" 5 #include "chrome/browser/ui/views/sync/one_click_signin_bubble_view.h"
6 6
7 #include "base/callback_helpers.h" 7 #include "base/callback_helpers.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/message_loop/message_loop.h" 9 #include "base/message_loop/message_loop.h"
10 #include "chrome/browser/google/google_util.h" 10 #include "chrome/browser/google/google_util.h"
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
120 } 120 }
121 } 121 }
122 122
123 OneClickSigninBubbleView::~OneClickSigninBubbleView() { 123 OneClickSigninBubbleView::~OneClickSigninBubbleView() {
124 } 124 }
125 125
126 ui::ModalType OneClickSigninBubbleView::GetModalType() const { 126 ui::ModalType OneClickSigninBubbleView::GetModalType() const {
127 return is_sync_dialog_? ui::MODAL_TYPE_CHILD : ui::MODAL_TYPE_NONE; 127 return is_sync_dialog_? ui::MODAL_TYPE_CHILD : ui::MODAL_TYPE_NONE;
128 } 128 }
129 129
130 void OneClickSigninBubbleView::AnimationEnded(const ui::Animation* animation) { 130 void OneClickSigninBubbleView::AnimationEnded(const gfx::Animation* animation) {
131 views::BubbleDelegateView::AnimationEnded(animation); 131 views::BubbleDelegateView::AnimationEnded(animation);
132 if (message_loop_for_testing_) 132 if (message_loop_for_testing_)
133 message_loop_for_testing_->Quit(); 133 message_loop_for_testing_->Quit();
134 } 134 }
135 135
136 void OneClickSigninBubbleView::Init() { 136 void OneClickSigninBubbleView::Init() {
137 views::GridLayout* layout = new views::GridLayout(this); 137 views::GridLayout* layout = new views::GridLayout(this);
138 SetLayoutManager(layout); 138 SetLayoutManager(layout);
139 set_border(views::Border::CreateEmptyBorder(8, 8, 8, 8)); 139 set_border(views::Border::CreateEmptyBorder(8, 8, 8, 8));
140 140
(...skipping 257 matching lines...) Expand 10 before | Expand all | Expand 10 after
398 // we'll be destroyed asynchronously and the shown state will be checked 398 // we'll be destroyed asynchronously and the shown state will be checked
399 // before then. 399 // before then.
400 DCHECK_EQ(bubble_view_, this); 400 DCHECK_EQ(bubble_view_, this);
401 bubble_view_ = NULL; 401 bubble_view_ = NULL;
402 402
403 if (is_sync_dialog_ && !start_sync_callback_.is_null()) { 403 if (is_sync_dialog_ && !start_sync_callback_.is_null()) {
404 base::ResetAndReturn(&start_sync_callback_).Run( 404 base::ResetAndReturn(&start_sync_callback_).Run(
405 OneClickSigninSyncStarter::SYNC_WITH_DEFAULT_SETTINGS); 405 OneClickSigninSyncStarter::SYNC_WITH_DEFAULT_SETTINGS);
406 } 406 }
407 } 407 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/sync/one_click_signin_bubble_view.h ('k') | chrome/browser/ui/views/tabs/tab.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698