| 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 #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 1349 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1360 FindBar* BrowserView::CreateFindBar() { | 1360 FindBar* BrowserView::CreateFindBar() { |
| 1361 return browser::CreateFindBar(this); | 1361 return browser::CreateFindBar(this); |
| 1362 } | 1362 } |
| 1363 | 1363 |
| 1364 #if defined(OS_CHROMEOS) | 1364 #if defined(OS_CHROMEOS) |
| 1365 void BrowserView::ShowMobileSetup() { | 1365 void BrowserView::ShowMobileSetup() { |
| 1366 MobileSetupDialog::Show(); | 1366 MobileSetupDialog::Show(); |
| 1367 } | 1367 } |
| 1368 | 1368 |
| 1369 void BrowserView::ShowKeyboardOverlay(gfx::NativeWindow owning_window) { | 1369 void BrowserView::ShowKeyboardOverlay(gfx::NativeWindow owning_window) { |
| 1370 #if defined(TOOLKIT_USES_GTK) | |
| 1371 KeyboardOverlayDialogView::ShowDialog(owning_window, this); | 1370 KeyboardOverlayDialogView::ShowDialog(owning_window, this); |
| 1372 #else | |
| 1373 // TODO(saintlou): Add Keyboard Overlay for Aura: crbug.com/99858. | |
| 1374 NOTIMPLEMENTED(); | |
| 1375 #endif | |
| 1376 } | 1371 } |
| 1377 #endif | 1372 #endif |
| 1378 | 1373 |
| 1379 /////////////////////////////////////////////////////////////////////////////// | 1374 /////////////////////////////////////////////////////////////////////////////// |
| 1380 // BrowserView, BrowserWindowTesting implementation: | 1375 // BrowserView, BrowserWindowTesting implementation: |
| 1381 | 1376 |
| 1382 BookmarkBarView* BrowserView::GetBookmarkBarView() const { | 1377 BookmarkBarView* BrowserView::GetBookmarkBarView() const { |
| 1383 return bookmark_bar_view_.get(); | 1378 return bookmark_bar_view_.get(); |
| 1384 } | 1379 } |
| 1385 | 1380 |
| (...skipping 1173 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2559 browser::CreateViewsBubble(bubble); | 2554 browser::CreateViewsBubble(bubble); |
| 2560 bubble->SetAlignment(views::BubbleBorder::ALIGN_EDGE_TO_ANCHOR_EDGE); | 2555 bubble->SetAlignment(views::BubbleBorder::ALIGN_EDGE_TO_ANCHOR_EDGE); |
| 2561 bubble->Show(); | 2556 bubble->Show(); |
| 2562 } | 2557 } |
| 2563 | 2558 |
| 2564 void BrowserView::ShowAvatarBubbleFromAvatarButton() { | 2559 void BrowserView::ShowAvatarBubbleFromAvatarButton() { |
| 2565 AvatarMenuButton* button = frame_->GetAvatarMenuButton(); | 2560 AvatarMenuButton* button = frame_->GetAvatarMenuButton(); |
| 2566 if (button) | 2561 if (button) |
| 2567 button->ShowAvatarBubble(); | 2562 button->ShowAvatarBubble(); |
| 2568 } | 2563 } |
| OLD | NEW |