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

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

Issue 10377114: Remove some more OS_CHROMEOS from browser. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 7 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) 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 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/auto_reset.h" 9 #include "base/auto_reset.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 1257 matching lines...) Expand 10 before | Expand all | Expand 10 after
1268 #endif 1268 #endif
1269 #else 1269 #else
1270 return NEW_POPUP; 1270 return NEW_POPUP;
1271 #endif 1271 #endif
1272 } 1272 }
1273 1273
1274 FindBar* BrowserView::CreateFindBar() { 1274 FindBar* BrowserView::CreateFindBar() {
1275 return browser::CreateFindBar(this); 1275 return browser::CreateFindBar(this);
1276 } 1276 }
1277 1277
1278 #if defined(OS_CHROMEOS)
1279 void BrowserView::ShowKeyboardOverlay(gfx::NativeWindow owning_window) {
1280 KeyboardOverlayDialogView::ShowDialog(owning_window, this);
1281 }
1282 #endif
1283
1284 /////////////////////////////////////////////////////////////////////////////// 1278 ///////////////////////////////////////////////////////////////////////////////
1285 // BrowserView, BrowserWindowTesting implementation: 1279 // BrowserView, BrowserWindowTesting implementation:
1286 1280
1287 BookmarkBarView* BrowserView::GetBookmarkBarView() const { 1281 BookmarkBarView* BrowserView::GetBookmarkBarView() const {
1288 return bookmark_bar_view_.get(); 1282 return bookmark_bar_view_.get();
1289 } 1283 }
1290 1284
1291 LocationBarView* BrowserView::GetLocationBarView() const { 1285 LocationBarView* BrowserView::GetLocationBarView() const {
1292 return toolbar_ ? toolbar_->location_bar() : NULL; 1286 return toolbar_ ? toolbar_->location_bar() : NULL;
1293 } 1287 }
(...skipping 1111 matching lines...) Expand 10 before | Expand all | Expand 10 after
2405 return; 2399 return;
2406 2400
2407 PasswordGenerationBubbleView* bubble = 2401 PasswordGenerationBubbleView* bubble =
2408 new PasswordGenerationBubbleView(bounds, 2402 new PasswordGenerationBubbleView(bounds,
2409 this, 2403 this,
2410 web_contents->GetRenderViewHost()); 2404 web_contents->GetRenderViewHost());
2411 views::BubbleDelegateView::CreateBubble(bubble); 2405 views::BubbleDelegateView::CreateBubble(bubble);
2412 bubble->SetAlignment(views::BubbleBorder::ALIGN_EDGE_TO_ANCHOR_EDGE); 2406 bubble->SetAlignment(views::BubbleBorder::ALIGN_EDGE_TO_ANCHOR_EDGE);
2413 bubble->Show(); 2407 bubble->Show();
2414 } 2408 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698