OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 #if defined(TOOLKIT_USES_GTK) | 7 #if defined(TOOLKIT_USES_GTK) |
8 #include <gtk/gtk.h> | 8 #include <gtk/gtk.h> |
9 #endif | 9 #endif |
10 | 10 |
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
74 #include "chrome/common/extensions/extension_resource.h" | 74 #include "chrome/common/extensions/extension_resource.h" |
75 #include "chrome/common/native_window_notification_source.h" | 75 #include "chrome/common/native_window_notification_source.h" |
76 #include "chrome/common/pref_names.h" | 76 #include "chrome/common/pref_names.h" |
77 #include "chrome/common/url_constants.h" | 77 #include "chrome/common/url_constants.h" |
78 #include "content/browser/download/download_manager.h" | 78 #include "content/browser/download/download_manager.h" |
79 #include "content/browser/renderer_host/render_view_host.h" | 79 #include "content/browser/renderer_host/render_view_host.h" |
80 #include "content/browser/renderer_host/render_widget_host_view.h" | 80 #include "content/browser/renderer_host/render_widget_host_view.h" |
81 #include "content/browser/tab_contents/tab_contents.h" | 81 #include "content/browser/tab_contents/tab_contents.h" |
82 #include "content/browser/tab_contents/tab_contents_view.h" | 82 #include "content/browser/tab_contents/tab_contents_view.h" |
83 #include "content/browser/user_metrics.h" | 83 #include "content/browser/user_metrics.h" |
84 #include "content/common/content_switches.h" | |
85 #include "content/common/notification_service.h" | 84 #include "content/common/notification_service.h" |
| 85 #include "content/public/common/content_switches.h" |
86 #include "grit/chromium_strings.h" | 86 #include "grit/chromium_strings.h" |
87 #include "grit/generated_resources.h" | 87 #include "grit/generated_resources.h" |
88 #include "grit/locale_settings.h" | 88 #include "grit/locale_settings.h" |
89 #include "grit/theme_resources.h" | 89 #include "grit/theme_resources.h" |
90 #include "grit/theme_resources_standard.h" | 90 #include "grit/theme_resources_standard.h" |
91 #include "grit/ui_resources.h" | 91 #include "grit/ui_resources.h" |
92 #include "grit/webkit_resources.h" | 92 #include "grit/webkit_resources.h" |
93 #include "ui/base/accessibility/accessible_view_state.h" | 93 #include "ui/base/accessibility/accessible_view_state.h" |
94 #include "ui/base/l10n/l10n_util.h" | 94 #include "ui/base/l10n/l10n_util.h" |
95 #include "ui/base/resource/resource_bundle.h" | 95 #include "ui/base/resource/resource_bundle.h" |
(...skipping 2456 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2552 views::View::ConvertPointToScreen(GetTabContentsContainerView(), &origin); | 2552 views::View::ConvertPointToScreen(GetTabContentsContainerView(), &origin); |
2553 gfx::Rect bounds; | 2553 gfx::Rect bounds; |
2554 bounds.set_origin(origin); | 2554 bounds.set_origin(origin); |
2555 | 2555 |
2556 AvatarMenuBubbleView* bubble_view = new AvatarMenuBubbleView(browser_.get()); | 2556 AvatarMenuBubbleView* bubble_view = new AvatarMenuBubbleView(browser_.get()); |
2557 // Bubble::Show() takes ownership of the view. | 2557 // Bubble::Show() takes ownership of the view. |
2558 Bubble::Show(this->GetWidget(), bounds, | 2558 Bubble::Show(this->GetWidget(), bounds, |
2559 views::BubbleBorder::TOP_RIGHT, | 2559 views::BubbleBorder::TOP_RIGHT, |
2560 bubble_view, bubble_view); | 2560 bubble_view, bubble_view); |
2561 } | 2561 } |
OLD | NEW |