| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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/chromeos/frame/browser_view.h" | 5 #include "chrome/browser/chromeos/frame/browser_view.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <string> | 8 #include <string> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 495 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 506 browser()->OpenSystemOptionsDialog(); | 506 browser()->OpenSystemOptionsDialog(); |
| 507 } | 507 } |
| 508 } | 508 } |
| 509 | 509 |
| 510 bool BrowserView::IsButtonVisible(const views::View* button_view) const { | 510 bool BrowserView::IsButtonVisible(const views::View* button_view) const { |
| 511 if (button_view == status_area_->menu_view()) | 511 if (button_view == status_area_->menu_view()) |
| 512 return !IsToolbarVisible(); | 512 return !IsToolbarVisible(); |
| 513 return true; | 513 return true; |
| 514 } | 514 } |
| 515 | 515 |
| 516 bool BrowserView::IsBrowserMode() const { |
| 517 return true; |
| 518 } |
| 519 |
| 516 //////////////////////////////////////////////////////////////////////////////// | 520 //////////////////////////////////////////////////////////////////////////////// |
| 517 // BrowserView public: | 521 // BrowserView public: |
| 518 | 522 |
| 519 void BrowserView::ShowCompactLocationBarUnderSelectedTab(bool select_all) { | 523 void BrowserView::ShowCompactLocationBarUnderSelectedTab(bool select_all) { |
| 520 if (!is_compact_style()) | 524 if (!is_compact_style()) |
| 521 return; | 525 return; |
| 522 int index = browser()->selected_index(); | 526 int index = browser()->selected_index(); |
| 523 compact_location_bar_host_->Update(index, true, select_all); | 527 compact_location_bar_host_->Update(index, true, select_all); |
| 524 } | 528 } |
| 525 | 529 |
| (...skipping 17 matching lines...) Expand all Loading... |
| 543 BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser) { | 547 BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser) { |
| 544 // Create a browser view for chromeos. | 548 // Create a browser view for chromeos. |
| 545 BrowserView* view; | 549 BrowserView* view; |
| 546 if (browser->type() & Browser::TYPE_POPUP) | 550 if (browser->type() & Browser::TYPE_POPUP) |
| 547 view = new chromeos::PanelBrowserView(browser); | 551 view = new chromeos::PanelBrowserView(browser); |
| 548 else | 552 else |
| 549 view = new chromeos::BrowserView(browser); | 553 view = new chromeos::BrowserView(browser); |
| 550 BrowserFrame::Create(view, browser->profile()); | 554 BrowserFrame::Create(view, browser->profile()); |
| 551 return view; | 555 return view; |
| 552 } | 556 } |
| OLD | NEW |