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

Side by Side Diff: chrome/browser/chromeos/frame/browser_view.cc

Issue 8596003: Revert 110613 - Implement the status tray/icon API for ChromeOS. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 1 month 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/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
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 status_area_->RemoveButton(button);
338 }
339
340 bool BrowserView::ContainsButton(StatusAreaButton* button) {
341 return status_area_->Contains(button);
342 }
343
344 chromeos::BrowserView* BrowserView::GetBrowserViewForBrowser(Browser* browser) {
345 // This calls the static method BrowserView::GetBrowserViewForBrowser in the
346 // global namespace. Check the chrome/browser/ui/views/frame/browser_view.h
347 // file for details.
348 return static_cast<chromeos::BrowserView*>(
349 ::BrowserView::GetBrowserViewForBrowser(browser));
350 }
351
352 // BrowserView, ::BrowserView overrides: 332 // BrowserView, ::BrowserView overrides:
353 333
354 void BrowserView::Init() { 334 void BrowserView::Init() {
355 ::BrowserView::Init(); 335 ::BrowserView::Init();
356 status_area_ = new StatusAreaViewChromeos(); 336 status_area_ = new StatusAreaViewChromeos();
357 status_area_->Init(this, StatusAreaViewChromeos::BROWSER_MODE); 337 status_area_->Init(this, StatusAreaViewChromeos::BROWSER_MODE);
358 status_area_->set_id(VIEW_ID_STATUS_AREA); 338 status_area_->set_id(VIEW_ID_STATUS_AREA);
359 AddChildView(status_area_); 339 AddChildView(status_area_);
360 340
361 layout_mode_button_ = new LayoutModeButton(); 341 layout_mode_button_ = new LayoutModeButton();
(...skipping 298 matching lines...) Expand 10 before | Expand all | Expand 10 after
660 BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser) { 640 BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser) {
661 // Create a browser view for chromeos. 641 // Create a browser view for chromeos.
662 BrowserView* view; 642 BrowserView* view;
663 if (browser->is_type_popup() || browser->is_type_panel()) 643 if (browser->is_type_popup() || browser->is_type_panel())
664 view = new chromeos::PanelBrowserView(browser); 644 view = new chromeos::PanelBrowserView(browser);
665 else 645 else
666 view = new chromeos::BrowserView(browser); 646 view = new chromeos::BrowserView(browser);
667 (new BrowserFrame(view))->InitBrowserFrame(); 647 (new BrowserFrame(view))->InitBrowserFrame();
668 return view; 648 return view;
669 } 649 }
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/frame/browser_view.h ('k') | chrome/browser/ui/views/status_icons/status_icon_chromeos.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698