Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(51)

Side by Side Diff: chrome/browser/ui/views/frame/browser_view.cc

Issue 8271025: Moved mobile activation into its own modal dialog (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
114 #elif defined(TOOLKIT_USES_GTK) 114 #elif defined(TOOLKIT_USES_GTK)
115 #include "chrome/browser/ui/views/accelerator_table_linux.h" 115 #include "chrome/browser/ui/views/accelerator_table_linux.h"
116 #include "views/window/hit_test.h" 116 #include "views/window/hit_test.h"
117 #if !defined(TOUCH_UI) 117 #if !defined(TOUCH_UI)
118 #include "chrome/browser/ui/views/handle_web_keyboard_event.h" 118 #include "chrome/browser/ui/views/handle_web_keyboard_event.h"
119 #endif 119 #endif
120 #endif 120 #endif
121 121
122 #if defined(OS_CHROMEOS) 122 #if defined(OS_CHROMEOS)
123 #include "chrome/browser/ui/views/keyboard_overlay_dialog_view.h" 123 #include "chrome/browser/ui/views/keyboard_overlay_dialog_view.h"
124 #include "chrome/browser/ui/webui/chromeos/mobile_setup_dialog.h"
124 #else 125 #else
125 #include "chrome/browser/ui/views/download/download_shelf_view.h" 126 #include "chrome/browser/ui/views/download/download_shelf_view.h"
126 #endif 127 #endif
127 128
128 #if defined(TOUCH_UI) 129 #if defined(TOUCH_UI)
129 #include "chrome/browser/ui/touch/status_bubble_touch.h" 130 #include "chrome/browser/ui/touch/status_bubble_touch.h"
130 #endif 131 #endif
131 132
132 using base::TimeDelta; 133 using base::TimeDelta;
133 using views::ColumnSet; 134 using views::ColumnSet;
(...skipping 1128 matching lines...) Expand 10 before | Expand all | Expand 10 after
1262 WindowOpenDisposition BrowserView::GetDispositionForPopupBounds( 1263 WindowOpenDisposition BrowserView::GetDispositionForPopupBounds(
1263 const gfx::Rect& bounds) { 1264 const gfx::Rect& bounds) {
1264 return NEW_POPUP; 1265 return NEW_POPUP;
1265 } 1266 }
1266 1267
1267 FindBar* BrowserView::CreateFindBar() { 1268 FindBar* BrowserView::CreateFindBar() {
1268 return browser::CreateFindBar(this); 1269 return browser::CreateFindBar(this);
1269 } 1270 }
1270 1271
1271 #if defined(OS_CHROMEOS) 1272 #if defined(OS_CHROMEOS)
1273 void BrowserView::ShowMobileSetup() {
1274 MobileSetupDialog::Show();
1275 }
1276
1272 void BrowserView::ShowKeyboardOverlay(gfx::NativeWindow owning_window) { 1277 void BrowserView::ShowKeyboardOverlay(gfx::NativeWindow owning_window) {
1273 #if defined(TOOLKIT_USES_GTK) 1278 #if defined(TOOLKIT_USES_GTK)
1274 KeyboardOverlayDialogView::ShowDialog(owning_window, this); 1279 KeyboardOverlayDialogView::ShowDialog(owning_window, this);
1275 #else 1280 #else
1276 // TODO(saintlou): Add Keyboard Overlay for Aura: crbug.com/99858. 1281 // TODO(saintlou): Add Keyboard Overlay for Aura: crbug.com/99858.
1277 NOTIMPLEMENTED(); 1282 NOTIMPLEMENTED();
1278 #endif 1283 #endif
1279 } 1284 }
1280 #endif 1285 #endif
1281 1286
(...skipping 1273 matching lines...) Expand 10 before | Expand all | Expand 10 after
2555 views::View::ConvertPointToScreen(GetTabContentsContainerView(), &origin); 2560 views::View::ConvertPointToScreen(GetTabContentsContainerView(), &origin);
2556 gfx::Rect bounds; 2561 gfx::Rect bounds;
2557 bounds.set_origin(origin); 2562 bounds.set_origin(origin);
2558 2563
2559 AvatarMenuBubbleView* bubble_view = new AvatarMenuBubbleView(browser_.get()); 2564 AvatarMenuBubbleView* bubble_view = new AvatarMenuBubbleView(browser_.get());
2560 // Bubble::Show() takes ownership of the view. 2565 // Bubble::Show() takes ownership of the view.
2561 Bubble::Show(this->GetWidget(), bounds, 2566 Bubble::Show(this->GetWidget(), bounds,
2562 views::BubbleBorder::TOP_RIGHT, 2567 views::BubbleBorder::TOP_RIGHT,
2563 bubble_view, bubble_view); 2568 bubble_view, bubble_view);
2564 } 2569 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698