chrome/browser/ui/views/profiles/user_manager_view.cc - Issue 1828363002: views: remove the last function abstraction from browser_dialogs.h

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

Issue 1828363002: views: remove the last function abstraction from browser_dialogs.h (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 9 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

« no previous file with comments | « chrome/browser/ui/views/location_bar/location_bar_view.cc ('k') | chrome/browser/ui/views/task_manager_view.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright 2014 The Chromium Authors. All rights reserved.	1 // Copyright 2014 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/user_manager_view.h"	5 #include "chrome/browser/ui/views/profiles/user_manager_view.h"

6	6

7 #include "base/callback.h"	7 #include "base/callback.h"

8 #include "base/time/time.h"	8 #include "base/time/time.h"

9 #include "build/build_config.h"	9 #include "build/build_config.h"

10 #include "chrome/browser/browser_process.h"	10 #include "chrome/browser/browser_process.h"

11 #include "chrome/browser/lifetime/keep_alive_types.h"	11 #include "chrome/browser/lifetime/keep_alive_types.h"

12 #include "chrome/browser/lifetime/scoped_keep_alive.h"	12 #include "chrome/browser/lifetime/scoped_keep_alive.h"

13 #include "chrome/browser/profiles/profile_avatar_icon_util.h"	13 #include "chrome/browser/profiles/profile_avatar_icon_util.h"

14 #include "chrome/browser/profiles/profile_manager.h"	14 #include "chrome/browser/profiles/profile_manager.h"

15 #include "chrome/browser/profiles/profile_metrics.h"	15 #include "chrome/browser/profiles/profile_metrics.h"

16 #include "chrome/browser/profiles/profile_window.h"	16 #include "chrome/browser/profiles/profile_window.h"

17 #include "chrome/browser/profiles/profiles_state.h"	17 #include "chrome/browser/profiles/profiles_state.h"

18 #include "chrome/browser/signin/signin_promo.h"	18 #include "chrome/browser/signin/signin_promo.h"

19 #include "chrome/browser/ui/browser.h"	19 #include "chrome/browser/ui/browser.h"

20 #include "chrome/browser/ui/browser_dialogs.h"	20 #include "chrome/browser/ui/browser_dialogs.h"

21 #include "chrome/browser/ui/browser_finder.h"	21 #include "chrome/browser/ui/browser_finder.h"

22 #include "chrome/browser/ui/browser_window.h"	22 #include "chrome/browser/ui/browser_window.h"

23 #include "chrome/browser/ui/user_manager.h"	23 #include "chrome/browser/ui/user_manager.h"

24 #include "chrome/browser/ui/views/browser_dialogs.h"

25 #include "chrome/grit/chromium_strings.h"	24 #include "chrome/grit/chromium_strings.h"

26 #include "chrome/grit/generated_resources.h"	25 #include "chrome/grit/generated_resources.h"

27 #include "components/guest_view/browser/guest_view_manager.h"	26 #include "components/guest_view/browser/guest_view_manager.h"

28 #include "content/public/browser/navigation_details.h"	27 #include "content/public/browser/navigation_details.h"

29 #include "content/public/browser/render_widget_host_view.h"	28 #include "content/public/browser/render_widget_host_view.h"

30 #include "content/public/browser/web_contents.h"	29 #include "content/public/browser/web_contents.h"

31 #include "google_apis/gaia/gaia_urls.h"	30 #include "google_apis/gaia/gaia_urls.h"

32 #include "ui/base/l10n/l10n_util.h"	31 #include "ui/base/l10n/l10n_util.h"

33 #include "ui/gfx/screen.h"	32 #include "ui/gfx/screen.h"

34 #include "ui/views/controls/webview/webview.h"	33 #include "ui/views/controls/webview/webview.h"

(...skipping 357 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
392 // Now that the window is closed, we can allow a new one to be opened.	391 // Now that the window is closed, we can allow a new one to be opened.

393 // (WindowClosing comes in asynchronously from the call to Close() and we	392 // (WindowClosing comes in asynchronously from the call to Close() and we

394 // may have already opened a new instance).	393 // may have already opened a new instance).

395 if (instance_ == this)	394 if (instance_ == this)

396 instance_ = NULL;	395 instance_ = NULL;

397 }	396 }

398	397

399 bool UserManagerView::UseNewStyleForThisDialog() const {	398 bool UserManagerView::UseNewStyleForThisDialog() const {

400 return false;	399 return false;

401 }	400 }

OLD	NEW