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 108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
119 #elif defined(TOOLKIT_USES_GTK) | 119 #elif defined(TOOLKIT_USES_GTK) |
120 #include "chrome/browser/ui/views/accelerator_table_linux.h" | 120 #include "chrome/browser/ui/views/accelerator_table_linux.h" |
121 #include "views/window/hit_test.h" | 121 #include "views/window/hit_test.h" |
122 #if !defined(TOUCH_UI) | 122 #if !defined(TOUCH_UI) |
123 #include "chrome/browser/ui/views/handle_web_keyboard_event.h" | 123 #include "chrome/browser/ui/views/handle_web_keyboard_event.h" |
124 #endif | 124 #endif |
125 #endif | 125 #endif |
126 | 126 |
127 #if defined(OS_CHROMEOS) | 127 #if defined(OS_CHROMEOS) |
128 #include "chrome/browser/ui/views/keyboard_overlay_dialog_view.h" | 128 #include "chrome/browser/ui/views/keyboard_overlay_dialog_view.h" |
| 129 #include "chrome/browser/ui/webui/chromeos/mobile_setup_dialog.h" |
129 #else | 130 #else |
130 #include "chrome/browser/ui/views/download/download_shelf_view.h" | 131 #include "chrome/browser/ui/views/download/download_shelf_view.h" |
131 #endif | 132 #endif |
132 | 133 |
133 #if defined(OS_WIN) && !defined(USE_AURA) | 134 #if defined(OS_WIN) && !defined(USE_AURA) |
134 #include "ui/base/view_prop.h" | 135 #include "ui/base/view_prop.h" |
135 #endif | 136 #endif |
136 | 137 |
137 #if defined(TOUCH_UI) | 138 #if defined(TOUCH_UI) |
138 #include "chrome/browser/ui/touch/status_bubble_touch.h" | 139 #include "chrome/browser/ui/touch/status_bubble_touch.h" |
(...skipping 1164 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1303 WindowOpenDisposition BrowserView::GetDispositionForPopupBounds( | 1304 WindowOpenDisposition BrowserView::GetDispositionForPopupBounds( |
1304 const gfx::Rect& bounds) { | 1305 const gfx::Rect& bounds) { |
1305 return NEW_POPUP; | 1306 return NEW_POPUP; |
1306 } | 1307 } |
1307 | 1308 |
1308 FindBar* BrowserView::CreateFindBar() { | 1309 FindBar* BrowserView::CreateFindBar() { |
1309 return browser::CreateFindBar(this); | 1310 return browser::CreateFindBar(this); |
1310 } | 1311 } |
1311 | 1312 |
1312 #if defined(OS_CHROMEOS) | 1313 #if defined(OS_CHROMEOS) |
| 1314 void BrowserView::ShowMobileSetup() { |
| 1315 MobileSetupDialog::Show(); |
| 1316 } |
| 1317 |
1313 void BrowserView::ShowKeyboardOverlay(gfx::NativeWindow owning_window) { | 1318 void BrowserView::ShowKeyboardOverlay(gfx::NativeWindow owning_window) { |
1314 #if defined(TOOLKIT_USES_GTK) | 1319 #if defined(TOOLKIT_USES_GTK) |
1315 KeyboardOverlayDialogView::ShowDialog(owning_window, this); | 1320 KeyboardOverlayDialogView::ShowDialog(owning_window, this); |
1316 #else | 1321 #else |
1317 // TODO(saintlou): Add Keyboard Overlay for Aura: crbug.com/99858. | 1322 // TODO(saintlou): Add Keyboard Overlay for Aura: crbug.com/99858. |
1318 NOTIMPLEMENTED(); | 1323 NOTIMPLEMENTED(); |
1319 #endif | 1324 #endif |
1320 } | 1325 } |
1321 #endif | 1326 #endif |
1322 | 1327 |
(...skipping 1285 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2608 views::View::ConvertPointToScreen(GetTabContentsContainerView(), &origin); | 2613 views::View::ConvertPointToScreen(GetTabContentsContainerView(), &origin); |
2609 gfx::Rect bounds; | 2614 gfx::Rect bounds; |
2610 bounds.set_origin(origin); | 2615 bounds.set_origin(origin); |
2611 | 2616 |
2612 AvatarMenuBubbleView* bubble_view = new AvatarMenuBubbleView(browser_.get()); | 2617 AvatarMenuBubbleView* bubble_view = new AvatarMenuBubbleView(browser_.get()); |
2613 // Bubble::Show() takes ownership of the view. | 2618 // Bubble::Show() takes ownership of the view. |
2614 Bubble::Show(this->GetWidget(), bounds, | 2619 Bubble::Show(this->GetWidget(), bounds, |
2615 views::BubbleBorder::TOP_RIGHT, | 2620 views::BubbleBorder::TOP_RIGHT, |
2616 bubble_view, bubble_view); | 2621 bubble_view, bubble_view); |
2617 } | 2622 } |
OLD | NEW |