Chromium Code Reviews| 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/chromeos/frame/browser_view.h" | 5 #include "chrome/browser/chromeos/frame/browser_view.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <set> | 8 #include <set> |
| 9 #include <string> | 9 #include <string> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 311 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 322 #endif | 322 #endif |
| 323 } | 323 } |
| 324 | 324 |
| 325 BrowserView::~BrowserView() { | 325 BrowserView::~BrowserView() { |
| 326 if (toolbar()) | 326 if (toolbar()) |
| 327 toolbar()->RemoveMenuListener(this); | 327 toolbar()->RemoveMenuListener(this); |
| 328 MessageLoopForUI::current()->RemoveObserver(this); | 328 MessageLoopForUI::current()->RemoveObserver(this); |
| 329 BrowserList::RemoveObserver(this); | 329 BrowserList::RemoveObserver(this); |
| 330 } | 330 } |
| 331 | 331 |
| 332 void BrowserView::AddTrayButton(StatusAreaButton* button, bool bordered) { | |
| 333 status_area_->AddButton(button, bordered); | |
| 334 } | |
| 335 | |
| 336 void BrowserView::RemoveTrayButton(StatusAreaButton* button) { | |
| 337 button->SetVisible(false); | |
| 338 button->SchedulePaint(); | |
|
Andrew T Wilson (Slow)
2011/11/14 23:46:03
This seems like an odd place to have to force the
Leandro GraciĆ” Gil
2011/11/15 22:23:31
It looks like this is not required anymore. Remove
| |
| 339 status_area_->RemoveButton(button); | |
| 340 } | |
| 341 | |
| 332 // BrowserView, ::BrowserView overrides: | 342 // BrowserView, ::BrowserView overrides: |
| 333 | 343 |
| 334 void BrowserView::Init() { | 344 void BrowserView::Init() { |
| 335 ::BrowserView::Init(); | 345 ::BrowserView::Init(); |
| 336 status_area_ = new StatusAreaViewChromeos(); | 346 status_area_ = new StatusAreaViewChromeos(); |
| 337 status_area_->Init(this, StatusAreaViewChromeos::BROWSER_MODE); | 347 status_area_->Init(this, StatusAreaViewChromeos::BROWSER_MODE); |
| 338 status_area_->set_id(VIEW_ID_STATUS_AREA); | 348 status_area_->set_id(VIEW_ID_STATUS_AREA); |
| 339 AddChildView(status_area_); | 349 AddChildView(status_area_); |
| 340 | 350 |
| 341 layout_mode_button_ = new LayoutModeButton(); | 351 layout_mode_button_ = new LayoutModeButton(); |
| (...skipping 298 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 640 BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser) { | 650 BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser) { |
| 641 // Create a browser view for chromeos. | 651 // Create a browser view for chromeos. |
| 642 BrowserView* view; | 652 BrowserView* view; |
| 643 if (browser->is_type_popup() || browser->is_type_panel()) | 653 if (browser->is_type_popup() || browser->is_type_panel()) |
| 644 view = new chromeos::PanelBrowserView(browser); | 654 view = new chromeos::PanelBrowserView(browser); |
| 645 else | 655 else |
| 646 view = new chromeos::BrowserView(browser); | 656 view = new chromeos::BrowserView(browser); |
| 647 (new BrowserFrame(view))->InitBrowserFrame(); | 657 (new BrowserFrame(view))->InitBrowserFrame(); |
| 648 return view; | 658 return view; |
| 649 } | 659 } |
| OLD | NEW |