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

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

Issue 11027017: Move ManagedMode classes to chrome/browser/managed_mode. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: sync Created 8 years, 1 month 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/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/string_number_conversions.h" 13 #include "base/string_number_conversions.h"
14 #include "base/utf_string_conversions.h" 14 #include "base/utf_string_conversions.h"
15 #include "chrome/app/chrome_command_ids.h" 15 #include "chrome/app/chrome_command_ids.h"
16 #include "chrome/app/chrome_dll_resource.h" 16 #include "chrome/app/chrome_dll_resource.h"
17 #include "chrome/browser/bookmarks/bookmark_utils.h" 17 #include "chrome/browser/bookmarks/bookmark_utils.h"
18 #include "chrome/browser/browser_process.h" 18 #include "chrome/browser/browser_process.h"
19 #include "chrome/browser/extensions/tab_helper.h" 19 #include "chrome/browser/extensions/tab_helper.h"
20 #include "chrome/browser/infobars/infobar_tab_helper.h" 20 #include "chrome/browser/infobars/infobar_tab_helper.h"
21 #include "chrome/browser/instant/instant_controller.h" 21 #include "chrome/browser/instant/instant_controller.h"
22 #include "chrome/browser/managed_mode.h" 22 #include "chrome/browser/managed_mode/managed_mode.h"
23 #include "chrome/browser/native_window_notification_source.h" 23 #include "chrome/browser/native_window_notification_source.h"
24 #include "chrome/browser/password_manager/password_manager.h" 24 #include "chrome/browser/password_manager/password_manager.h"
25 #include "chrome/browser/prefs/pref_service.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/extension_api/tts_extension_api.h" 32 #include "chrome/browser/speech/extension_api/tts_extension_api.h"
(...skipping 2637 matching lines...) Expand 10 before | Expand all | Expand 10 after
2670 2670
2671 Browser* modal_browser = 2671 Browser* modal_browser =
2672 browser::FindBrowserWithWebContents(active_dialog->web_contents()); 2672 browser::FindBrowserWithWebContents(active_dialog->web_contents());
2673 if (modal_browser && (browser_ != modal_browser)) { 2673 if (modal_browser && (browser_ != modal_browser)) {
2674 modal_browser->window()->FlashFrame(true); 2674 modal_browser->window()->FlashFrame(true);
2675 modal_browser->window()->Activate(); 2675 modal_browser->window()->Activate();
2676 } 2676 }
2677 2677
2678 AppModalDialogQueue::GetInstance()->ActivateModalDialog(); 2678 AppModalDialogQueue::GetInstance()->ActivateModalDialog();
2679 } 2679 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698