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

Side by Side Diff: chrome/browser/ui/views/profiles/signin_view_controller.cc

Issue 1545153002: Switch to standard integer types in chrome/browser/ui/views/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 12 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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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/profiles/signin_view_controller.h" 5 #include "chrome/browser/ui/views/profiles/signin_view_controller.h"
6 6
7 #include "base/macros.h"
7 #include "chrome/browser/profiles/profile.h" 8 #include "chrome/browser/profiles/profile.h"
8 #include "chrome/browser/profiles/profile_avatar_icon_util.h" 9 #include "chrome/browser/profiles/profile_avatar_icon_util.h"
9 #include "chrome/browser/signin/signin_error_controller_factory.h" 10 #include "chrome/browser/signin/signin_error_controller_factory.h"
10 #include "chrome/browser/signin/signin_promo.h" 11 #include "chrome/browser/signin/signin_promo.h"
11 #include "chrome/browser/ui/browser.h" 12 #include "chrome/browser/ui/browser.h"
12 #include "chrome/browser/ui/tabs/tab_strip_model.h" 13 #include "chrome/browser/ui/tabs/tab_strip_model.h"
13 #include "components/constrained_window/constrained_window_views.h" 14 #include "components/constrained_window/constrained_window_views.h"
14 #include "components/signin/core/browser/signin_error_controller.h" 15 #include "components/signin/core/browser/signin_error_controller.h"
15 #include "components/signin/core/common/profile_management_switches.h" 16 #include "components/signin/core/common/profile_management_switches.h"
16 #include "content/public/browser/render_widget_host_view.h" 17 #include "content/public/browser/render_widget_host_view.h"
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
145 } 146 }
146 147
147 // static 148 // static
148 bool SigninViewController::ShouldShowModalSigninForMode( 149 bool SigninViewController::ShouldShowModalSigninForMode(
149 profiles::BubbleViewMode mode) { 150 profiles::BubbleViewMode mode) {
150 return switches::UsePasswordSeparatedSigninFlow() && 151 return switches::UsePasswordSeparatedSigninFlow() &&
151 (mode == profiles::BUBBLE_VIEW_MODE_GAIA_SIGNIN || 152 (mode == profiles::BUBBLE_VIEW_MODE_GAIA_SIGNIN ||
152 mode == profiles::BUBBLE_VIEW_MODE_GAIA_ADD_ACCOUNT || 153 mode == profiles::BUBBLE_VIEW_MODE_GAIA_ADD_ACCOUNT ||
153 mode == profiles::BUBBLE_VIEW_MODE_GAIA_REAUTH); 154 mode == profiles::BUBBLE_VIEW_MODE_GAIA_REAUTH);
154 } 155 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698