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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 12335141: Move c/b/ui/search/search.* to c/b/instant/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Created 7 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/bookmarks/bookmark_context_menu_controller_views.cc ('k') | chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.cc » ('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 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/prefs/pref_service.h"
14 #include "base/strings/string_number_conversions.h" 14 #include "base/strings/string_number_conversions.h"
15 #include "base/utf_string_conversions.h" 15 #include "base/utf_string_conversions.h"
16 #include "chrome/app/chrome_command_ids.h" 16 #include "chrome/app/chrome_command_ids.h"
17 #include "chrome/app/chrome_dll_resource.h" 17 #include "chrome/app/chrome_dll_resource.h"
18 #include "chrome/browser/api/infobars/infobar_service.h" 18 #include "chrome/browser/api/infobars/infobar_service.h"
19 #include "chrome/browser/app_mode/app_mode_utils.h" 19 #include "chrome/browser/app_mode/app_mode_utils.h"
20 #include "chrome/browser/bookmarks/bookmark_utils.h" 20 #include "chrome/browser/bookmarks/bookmark_utils.h"
21 #include "chrome/browser/browser_process.h" 21 #include "chrome/browser/browser_process.h"
22 #include "chrome/browser/extensions/tab_helper.h" 22 #include "chrome/browser/extensions/tab_helper.h"
23 #include "chrome/browser/instant/search.h"
23 #include "chrome/browser/managed_mode/managed_mode.h" 24 #include "chrome/browser/managed_mode/managed_mode.h"
24 #include "chrome/browser/native_window_notification_source.h" 25 #include "chrome/browser/native_window_notification_source.h"
25 #include "chrome/browser/password_manager/password_manager.h" 26 #include "chrome/browser/password_manager/password_manager.h"
26 #include "chrome/browser/profiles/avatar_menu_model.h" 27 #include "chrome/browser/profiles/avatar_menu_model.h"
27 #include "chrome/browser/profiles/profile.h" 28 #include "chrome/browser/profiles/profile.h"
28 #include "chrome/browser/profiles/profile_info_cache.h" 29 #include "chrome/browser/profiles/profile_info_cache.h"
29 #include "chrome/browser/profiles/profile_manager.h" 30 #include "chrome/browser/profiles/profile_manager.h"
30 #include "chrome/browser/sessions/tab_restore_service.h" 31 #include "chrome/browser/sessions/tab_restore_service.h"
31 #include "chrome/browser/sessions/tab_restore_service_factory.h" 32 #include "chrome/browser/sessions/tab_restore_service_factory.h"
32 #include "chrome/browser/speech/tts_controller.h" 33 #include "chrome/browser/speech/tts_controller.h"
33 #include "chrome/browser/themes/theme_properties.h" 34 #include "chrome/browser/themes/theme_properties.h"
34 #include "chrome/browser/ui/app_modal_dialogs/app_modal_dialog.h" 35 #include "chrome/browser/ui/app_modal_dialogs/app_modal_dialog.h"
35 #include "chrome/browser/ui/app_modal_dialogs/app_modal_dialog_queue.h" 36 #include "chrome/browser/ui/app_modal_dialogs/app_modal_dialog_queue.h"
36 #include "chrome/browser/ui/bookmarks/bookmark_utils.h" 37 #include "chrome/browser/ui/bookmarks/bookmark_utils.h"
37 #include "chrome/browser/ui/browser.h" 38 #include "chrome/browser/ui/browser.h"
38 #include "chrome/browser/ui/browser_command_controller.h" 39 #include "chrome/browser/ui/browser_command_controller.h"
39 #include "chrome/browser/ui/browser_commands.h" 40 #include "chrome/browser/ui/browser_commands.h"
40 #include "chrome/browser/ui/browser_dialogs.h" 41 #include "chrome/browser/ui/browser_dialogs.h"
41 #include "chrome/browser/ui/browser_finder.h" 42 #include "chrome/browser/ui/browser_finder.h"
42 #include "chrome/browser/ui/browser_list.h" 43 #include "chrome/browser/ui/browser_list.h"
43 #include "chrome/browser/ui/browser_window_state.h" 44 #include "chrome/browser/ui/browser_window_state.h"
44 #include "chrome/browser/ui/ntp_background_util.h" 45 #include "chrome/browser/ui/ntp_background_util.h"
45 #include "chrome/browser/ui/omnibox/omnibox_popup_model.h" 46 #include "chrome/browser/ui/omnibox/omnibox_popup_model.h"
46 #include "chrome/browser/ui/omnibox/omnibox_popup_view.h" 47 #include "chrome/browser/ui/omnibox/omnibox_popup_view.h"
47 #include "chrome/browser/ui/omnibox/omnibox_view.h" 48 #include "chrome/browser/ui/omnibox/omnibox_view.h"
48 #include "chrome/browser/ui/search/search.h"
49 #include "chrome/browser/ui/search/search_delegate.h" 49 #include "chrome/browser/ui/search/search_delegate.h"
50 #include "chrome/browser/ui/search/search_model.h" 50 #include "chrome/browser/ui/search/search_model.h"
51 #include "chrome/browser/ui/search/search_ui.h" 51 #include "chrome/browser/ui/search/search_ui.h"
52 #include "chrome/browser/ui/tabs/tab_menu_model.h" 52 #include "chrome/browser/ui/tabs/tab_menu_model.h"
53 #include "chrome/browser/ui/tabs/tab_strip_model.h" 53 #include "chrome/browser/ui/tabs/tab_strip_model.h"
54 #include "chrome/browser/ui/view_ids.h" 54 #include "chrome/browser/ui/view_ids.h"
55 #include "chrome/browser/ui/views/accelerator_table.h" 55 #include "chrome/browser/ui/views/accelerator_table.h"
56 #include "chrome/browser/ui/views/accessibility/invert_bubble_view.h" 56 #include "chrome/browser/ui/views/accessibility/invert_bubble_view.h"
57 #include "chrome/browser/ui/views/avatar_menu_bubble_view.h" 57 #include "chrome/browser/ui/views/avatar_menu_bubble_view.h"
58 #include "chrome/browser/ui/views/avatar_menu_button.h" 58 #include "chrome/browser/ui/views/avatar_menu_button.h"
(...skipping 2649 matching lines...) Expand 10 before | Expand all | Expand 10 after
2708 2708
2709 Browser* modal_browser = 2709 Browser* modal_browser =
2710 chrome::FindBrowserWithWebContents(active_dialog->web_contents()); 2710 chrome::FindBrowserWithWebContents(active_dialog->web_contents());
2711 if (modal_browser && (browser_ != modal_browser)) { 2711 if (modal_browser && (browser_ != modal_browser)) {
2712 modal_browser->window()->FlashFrame(true); 2712 modal_browser->window()->FlashFrame(true);
2713 modal_browser->window()->Activate(); 2713 modal_browser->window()->Activate();
2714 } 2714 }
2715 2715
2716 AppModalDialogQueue::GetInstance()->ActivateModalDialog(); 2716 AppModalDialogQueue::GetInstance()->ActivateModalDialog();
2717 } 2717 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/bookmarks/bookmark_context_menu_controller_views.cc ('k') | chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698