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

Side by Side Diff: chrome/browser/profiles/profile_window.cc

Issue 485073002: Migrate signin error messages to the new avatar bubble (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fixed cros error Created 6 years, 4 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
« no previous file with comments | « no previous file | chrome/browser/signin/signin_ui_util.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 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/profiles/profile_window.h" 5 #include "chrome/browser/profiles/profile_window.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/files/file_path.h" 8 #include "base/files/file_path.h"
9 #include "base/prefs/pref_service.h" 9 #include "base/prefs/pref_service.h"
10 #include "base/strings/string_number_conversions.h" 10 #include "base/strings/string_number_conversions.h"
(...skipping 354 matching lines...) Expand 10 before | Expand all | Expand 10 after
365 case BrowserWindow::AVATAR_BUBBLE_MODE_ADD_ACCOUNT: 365 case BrowserWindow::AVATAR_BUBBLE_MODE_ADD_ACCOUNT:
366 *bubble_view_mode = BUBBLE_VIEW_MODE_GAIA_ADD_ACCOUNT; 366 *bubble_view_mode = BUBBLE_VIEW_MODE_GAIA_ADD_ACCOUNT;
367 return; 367 return;
368 case BrowserWindow::AVATAR_BUBBLE_MODE_REAUTH: 368 case BrowserWindow::AVATAR_BUBBLE_MODE_REAUTH:
369 *bubble_view_mode = BUBBLE_VIEW_MODE_GAIA_REAUTH; 369 *bubble_view_mode = BUBBLE_VIEW_MODE_GAIA_REAUTH;
370 return; 370 return;
371 case BrowserWindow::AVATAR_BUBBLE_MODE_CONFIRM_SIGNIN: 371 case BrowserWindow::AVATAR_BUBBLE_MODE_CONFIRM_SIGNIN:
372 *bubble_view_mode = BUBBLE_VIEW_MODE_PROFILE_CHOOSER; 372 *bubble_view_mode = BUBBLE_VIEW_MODE_PROFILE_CHOOSER;
373 *tutorial_mode = TUTORIAL_MODE_CONFIRM_SIGNIN; 373 *tutorial_mode = TUTORIAL_MODE_CONFIRM_SIGNIN;
374 return; 374 return;
375 case BrowserWindow::AVATAR_BUBBLE_MODE_SHOW_ERROR:
376 *bubble_view_mode = BUBBLE_VIEW_MODE_PROFILE_CHOOSER;
377 *tutorial_mode = TUTORIAL_MODE_SHOW_ERROR;
378 return;
375 default: 379 default:
376 *bubble_view_mode = profiles::BUBBLE_VIEW_MODE_PROFILE_CHOOSER; 380 *bubble_view_mode = profiles::BUBBLE_VIEW_MODE_PROFILE_CHOOSER;
377 } 381 }
378 } 382 }
379 383
380 } // namespace profiles 384 } // namespace profiles
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/signin/signin_ui_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698