| OLD | NEW |
| 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" |
| (...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 63 #include "chrome/browser/ui/views/omnibox/omnibox_views.h" | 63 #include "chrome/browser/ui/views/omnibox/omnibox_views.h" |
| 64 #include "chrome/browser/ui/views/omnibox/omnibox_view_views.h" | 64 #include "chrome/browser/ui/views/omnibox/omnibox_view_views.h" |
| 65 #include "chrome/browser/ui/views/password_generation_bubble_view.h" | 65 #include "chrome/browser/ui/views/password_generation_bubble_view.h" |
| 66 #include "chrome/browser/ui/views/status_bubble_views.h" | 66 #include "chrome/browser/ui/views/status_bubble_views.h" |
| 67 #include "chrome/browser/ui/views/tabs/browser_tab_strip_controller.h" | 67 #include "chrome/browser/ui/views/tabs/browser_tab_strip_controller.h" |
| 68 #include "chrome/browser/ui/views/tabs/tab_strip.h" | 68 #include "chrome/browser/ui/views/tabs/tab_strip.h" |
| 69 #include "chrome/browser/ui/views/toolbar_view.h" | 69 #include "chrome/browser/ui/views/toolbar_view.h" |
| 70 #include "chrome/browser/ui/views/update_recommended_message_box.h" | 70 #include "chrome/browser/ui/views/update_recommended_message_box.h" |
| 71 #include "chrome/browser/ui/views/website_settings/website_settings_popup_view.h
" | 71 #include "chrome/browser/ui/views/website_settings/website_settings_popup_view.h
" |
| 72 #include "chrome/browser/ui/webui/feedback_ui.h" | 72 #include "chrome/browser/ui/webui/feedback_ui.h" |
| 73 #include "chrome/browser/ui/window_sizer.h" | 73 #include "chrome/browser/ui/window_sizer/window_sizer.h" |
| 74 #include "chrome/common/chrome_notification_types.h" | 74 #include "chrome/common/chrome_notification_types.h" |
| 75 #include "chrome/common/chrome_switches.h" | 75 #include "chrome/common/chrome_switches.h" |
| 76 #include "chrome/common/extensions/extension_resource.h" | 76 #include "chrome/common/extensions/extension_resource.h" |
| 77 #include "chrome/common/pref_names.h" | 77 #include "chrome/common/pref_names.h" |
| 78 #include "chrome/common/url_constants.h" | 78 #include "chrome/common/url_constants.h" |
| 79 #include "content/public/browser/download_manager.h" | 79 #include "content/public/browser/download_manager.h" |
| 80 #include "content/public/browser/native_web_keyboard_event.h" | 80 #include "content/public/browser/native_web_keyboard_event.h" |
| 81 #include "content/public/browser/notification_service.h" | 81 #include "content/public/browser/notification_service.h" |
| 82 #include "content/public/browser/render_view_host.h" | 82 #include "content/public/browser/render_view_host.h" |
| 83 #include "content/public/browser/user_metrics.h" | 83 #include "content/public/browser/user_metrics.h" |
| (...skipping 2480 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2564 bubble->Show(); | 2564 bubble->Show(); |
| 2565 } | 2565 } |
| 2566 | 2566 |
| 2567 void BrowserView::RestackLocationBarContainer() { | 2567 void BrowserView::RestackLocationBarContainer() { |
| 2568 #if defined(USE_AURA) | 2568 #if defined(USE_AURA) |
| 2569 if (search_view_controller_.get()) | 2569 if (search_view_controller_.get()) |
| 2570 search_view_controller_->StackAtTop(); | 2570 search_view_controller_->StackAtTop(); |
| 2571 #endif | 2571 #endif |
| 2572 toolbar_->location_bar_container()->StackAtTop(); | 2572 toolbar_->location_bar_container()->StackAtTop(); |
| 2573 } | 2573 } |
| OLD | NEW |