chrome/browser/ui/views/frame/browser_view.cc - Issue 12211105: Move remaining non-test, non-Chrome-specific Prefs code to base/prefs/.

Side by Side Diff: chrome/browser/ui/views/frame/browser_view.cc

Issue 12211105: Move remaining non-test, non-Chrome-specific Prefs code to base/prefs/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Address review comments, merge to LKGR. Created 7 years, 10 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 | « chrome/browser/ui/views/extensions/disabled_extensions_view.cc ('k') | chrome/browser/ui/views/frame/glass_browser_frame_view.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

6	6

7 #include <algorithm>	7 #include <algorithm>

8	8

9 #include "base/auto_reset.h"	9 #include "base/auto_reset.h"

10 #include "base/command_line.h"	10 #include "base/command_line.h"

11 #include "base/i18n/rtl.h"	11 #include "base/i18n/rtl.h"

12 #include "base/metrics/histogram.h"	12 #include "base/metrics/histogram.h"

	13 #include "base/prefs/pref_service.h"

13 #include "base/strings/string_number_conversions.h"	14 #include "base/strings/string_number_conversions.h"

14 #include "base/utf_string_conversions.h"	15 #include "base/utf_string_conversions.h"

15 #include "chrome/app/chrome_command_ids.h"	16 #include "chrome/app/chrome_command_ids.h"

16 #include "chrome/app/chrome_dll_resource.h"	17 #include "chrome/app/chrome_dll_resource.h"

17 #include "chrome/browser/api/infobars/infobar_service.h"	18 #include "chrome/browser/api/infobars/infobar_service.h"

18 #include "chrome/browser/app_mode/app_mode_utils.h"	19 #include "chrome/browser/app_mode/app_mode_utils.h"

19 #include "chrome/browser/bookmarks/bookmark_utils.h"	20 #include "chrome/browser/bookmarks/bookmark_utils.h"

20 #include "chrome/browser/browser_process.h"	21 #include "chrome/browser/browser_process.h"

21 #include "chrome/browser/extensions/tab_helper.h"	22 #include "chrome/browser/extensions/tab_helper.h"

22 #include "chrome/browser/managed_mode/managed_mode.h"	23 #include "chrome/browser/managed_mode/managed_mode.h"

23 #include "chrome/browser/native_window_notification_source.h"	24 #include "chrome/browser/native_window_notification_source.h"

24 #include "chrome/browser/password_manager/password_manager.h"	25 #include "chrome/browser/password_manager/password_manager.h"

25 #include "chrome/browser/prefs/pref_service.h"

26 #include "chrome/browser/profiles/avatar_menu_model.h"	26 #include "chrome/browser/profiles/avatar_menu_model.h"

27 #include "chrome/browser/profiles/profile.h"	27 #include "chrome/browser/profiles/profile.h"

28 #include "chrome/browser/profiles/profile_info_cache.h"	28 #include "chrome/browser/profiles/profile_info_cache.h"

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

30 #include "chrome/browser/sessions/tab_restore_service.h"	30 #include "chrome/browser/sessions/tab_restore_service.h"

31 #include "chrome/browser/sessions/tab_restore_service_factory.h"	31 #include "chrome/browser/sessions/tab_restore_service_factory.h"

32 #include "chrome/browser/speech/tts_controller.h"	32 #include "chrome/browser/speech/tts_controller.h"

33 #include "chrome/browser/themes/theme_service.h"	33 #include "chrome/browser/themes/theme_service.h"

34 #include "chrome/browser/ui/app_modal_dialogs/app_modal_dialog.h"	34 #include "chrome/browser/ui/app_modal_dialogs/app_modal_dialog.h"

35 #include "chrome/browser/ui/app_modal_dialogs/app_modal_dialog_queue.h"	35 #include "chrome/browser/ui/app_modal_dialogs/app_modal_dialog_queue.h"

(...skipping 2581 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
2617	2617

2618 Browser* modal_browser =	2618 Browser* modal_browser =

2619 chrome::FindBrowserWithWebContents(active_dialog->web_contents());	2619 chrome::FindBrowserWithWebContents(active_dialog->web_contents());

2620 if (modal_browser && (browser_ != modal_browser)) {	2620 if (modal_browser && (browser_ != modal_browser)) {

2621 modal_browser->window()->FlashFrame(true);	2621 modal_browser->window()->FlashFrame(true);

2622 modal_browser->window()->Activate();	2622 modal_browser->window()->Activate();

2623 }	2623 }

2624	2624

2625 AppModalDialogQueue::GetInstance()->ActivateModalDialog();	2625 AppModalDialogQueue::GetInstance()->ActivateModalDialog();

2626 }	2626 }

OLD	NEW