| 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 107 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 118 #elif defined(TOOLKIT_USES_GTK) | 118 #elif defined(TOOLKIT_USES_GTK) |
| 119 #include "chrome/browser/ui/views/accelerator_table_linux.h" | 119 #include "chrome/browser/ui/views/accelerator_table_linux.h" |
| 120 #include "views/window/hit_test.h" | 120 #include "views/window/hit_test.h" |
| 121 #if !defined(TOUCH_UI) | 121 #if !defined(TOUCH_UI) |
| 122 #include "chrome/browser/ui/views/handle_web_keyboard_event.h" | 122 #include "chrome/browser/ui/views/handle_web_keyboard_event.h" |
| 123 #endif | 123 #endif |
| 124 #endif | 124 #endif |
| 125 | 125 |
| 126 #if defined(OS_CHROMEOS) | 126 #if defined(OS_CHROMEOS) |
| 127 #include "chrome/browser/ui/views/keyboard_overlay_dialog_view.h" | 127 #include "chrome/browser/ui/views/keyboard_overlay_dialog_view.h" |
| 128 #include "chrome/browser/ui/webui/chromeos/mobile_setup_dialog.h" |
| 128 #else | 129 #else |
| 129 #include "chrome/browser/ui/views/download/download_shelf_view.h" | 130 #include "chrome/browser/ui/views/download/download_shelf_view.h" |
| 130 #endif | 131 #endif |
| 131 | 132 |
| 132 #if defined(OS_WIN) && !defined(USE_AURA) | 133 #if defined(OS_WIN) && !defined(USE_AURA) |
| 133 #include "ui/base/view_prop.h" | 134 #include "ui/base/view_prop.h" |
| 134 #endif | 135 #endif |
| 135 | 136 |
| 136 #if defined(TOUCH_UI) | 137 #if defined(TOUCH_UI) |
| 137 #include "chrome/browser/ui/touch/status_bubble_touch.h" | 138 #include "chrome/browser/ui/touch/status_bubble_touch.h" |
| (...skipping 1154 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1292 WindowOpenDisposition BrowserView::GetDispositionForPopupBounds( | 1293 WindowOpenDisposition BrowserView::GetDispositionForPopupBounds( |
| 1293 const gfx::Rect& bounds) { | 1294 const gfx::Rect& bounds) { |
| 1294 return NEW_POPUP; | 1295 return NEW_POPUP; |
| 1295 } | 1296 } |
| 1296 | 1297 |
| 1297 FindBar* BrowserView::CreateFindBar() { | 1298 FindBar* BrowserView::CreateFindBar() { |
| 1298 return browser::CreateFindBar(this); | 1299 return browser::CreateFindBar(this); |
| 1299 } | 1300 } |
| 1300 | 1301 |
| 1301 #if defined(OS_CHROMEOS) | 1302 #if defined(OS_CHROMEOS) |
| 1303 void BrowserView::ShowMobileSetup() { |
| 1304 MobileSetupDialog::Show(); |
| 1305 } |
| 1306 |
| 1302 void BrowserView::ShowKeyboardOverlay(gfx::NativeWindow owning_window) { | 1307 void BrowserView::ShowKeyboardOverlay(gfx::NativeWindow owning_window) { |
| 1303 #if defined(TOOLKIT_USES_GTK) | 1308 #if defined(TOOLKIT_USES_GTK) |
| 1304 KeyboardOverlayDialogView::ShowDialog(owning_window, this); | 1309 KeyboardOverlayDialogView::ShowDialog(owning_window, this); |
| 1305 #else | 1310 #else |
| 1306 // TODO(saintlou): Add Keyboard Overlay for Aura: crbug.com/99858. | 1311 // TODO(saintlou): Add Keyboard Overlay for Aura: crbug.com/99858. |
| 1307 NOTIMPLEMENTED(); | 1312 NOTIMPLEMENTED(); |
| 1308 #endif | 1313 #endif |
| 1309 } | 1314 } |
| 1310 #endif | 1315 #endif |
| 1311 | 1316 |
| (...skipping 1281 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2593 views::View::ConvertPointToScreen(GetTabContentsContainerView(), &origin); | 2598 views::View::ConvertPointToScreen(GetTabContentsContainerView(), &origin); |
| 2594 gfx::Rect bounds; | 2599 gfx::Rect bounds; |
| 2595 bounds.set_origin(origin); | 2600 bounds.set_origin(origin); |
| 2596 | 2601 |
| 2597 AvatarMenuBubbleView* bubble_view = new AvatarMenuBubbleView(browser_.get()); | 2602 AvatarMenuBubbleView* bubble_view = new AvatarMenuBubbleView(browser_.get()); |
| 2598 // Bubble::Show() takes ownership of the view. | 2603 // Bubble::Show() takes ownership of the view. |
| 2599 Bubble::Show(this->GetWidget(), bounds, | 2604 Bubble::Show(this->GetWidget(), bounds, |
| 2600 views::BubbleBorder::TOP_RIGHT, | 2605 views::BubbleBorder::TOP_RIGHT, |
| 2601 bubble_view, bubble_view); | 2606 bubble_view, bubble_view); |
| 2602 } | 2607 } |
| OLD | NEW |