| 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 509 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 520 browser()->OpenLanguageOptionsDialog(); | 520 browser()->OpenLanguageOptionsDialog(); |
| 521 break; | 521 break; |
| 522 case StatusAreaButton::Delegate::SHOW_SYSTEM_OPTIONS: | 522 case StatusAreaButton::Delegate::SHOW_SYSTEM_OPTIONS: |
| 523 browser()->OpenSystemOptionsDialog(); | 523 browser()->OpenSystemOptionsDialog(); |
| 524 break; | 524 break; |
| 525 default: | 525 default: |
| 526 NOTREACHED(); | 526 NOTREACHED(); |
| 527 } | 527 } |
| 528 } | 528 } |
| 529 | 529 |
| 530 gfx::Font BrowserView::GetStatusAreaFont(const gfx::Font& font) const { | |
| 531 return font.DeriveFont(0, gfx::Font::BOLD); | |
| 532 } | |
| 533 | |
| 534 StatusAreaButton::TextStyle BrowserView::GetStatusAreaTextStyle() const { | 530 StatusAreaButton::TextStyle BrowserView::GetStatusAreaTextStyle() const { |
| 535 ThemeService* theme_service = | 531 ThemeService* theme_service = |
| 536 ThemeServiceFactory::GetForProfile(browser()->profile()); | 532 ThemeServiceFactory::GetForProfile(browser()->profile()); |
| 537 | 533 |
| 538 if (!theme_service->UsingDefaultTheme()) | 534 if (!theme_service->UsingDefaultTheme()) |
| 539 return StatusAreaButton::WHITE_HALOED; | 535 return StatusAreaButton::WHITE_HALOED_BOLD; |
| 540 | 536 |
| 541 return IsOffTheRecord() ? | 537 return IsOffTheRecord() ? |
| 542 StatusAreaButton::WHITE_PLAIN : StatusAreaButton::GRAY_EMBOSSED; | 538 StatusAreaButton::WHITE_PLAIN_BOLD : StatusAreaButton::GRAY_EMBOSSED_BOLD; |
| 543 } | 539 } |
| 544 | 540 |
| 545 void BrowserView::ButtonVisibilityChanged(views::View* button_view) { | 541 void BrowserView::ButtonVisibilityChanged(views::View* button_view) { |
| 546 if (status_area_) | 542 if (status_area_) |
| 547 status_area_->UpdateButtonVisibility(); | 543 status_area_->UpdateButtonVisibility(); |
| 548 } | 544 } |
| 549 | 545 |
| 550 // BrowserView, MessageLoopForUI::Observer implementation. | 546 // BrowserView, MessageLoopForUI::Observer implementation. |
| 551 | 547 |
| 552 #if defined(USE_AURA) | 548 #if defined(USE_AURA) |
| (...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 638 BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser) { | 634 BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser) { |
| 639 // Create a browser view for chromeos. | 635 // Create a browser view for chromeos. |
| 640 BrowserView* view; | 636 BrowserView* view; |
| 641 if (browser->is_type_popup() || browser->is_type_panel()) | 637 if (browser->is_type_popup() || browser->is_type_panel()) |
| 642 view = new chromeos::PanelBrowserView(browser); | 638 view = new chromeos::PanelBrowserView(browser); |
| 643 else | 639 else |
| 644 view = new chromeos::BrowserView(browser); | 640 view = new chromeos::BrowserView(browser); |
| 645 (new BrowserFrame(view))->InitBrowserFrame(); | 641 (new BrowserFrame(view))->InitBrowserFrame(); |
| 646 return view; | 642 return view; |
| 647 } | 643 } |
| OLD | NEW |