| 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 550 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 561 StatusAreaButton::WHITE_PLAIN : StatusAreaButton::GRAY_EMBOSSED; | 561 StatusAreaButton::WHITE_PLAIN : StatusAreaButton::GRAY_EMBOSSED; |
| 562 } | 562 } |
| 563 | 563 |
| 564 void BrowserView::ButtonVisibilityChanged(views::View* button_view) { | 564 void BrowserView::ButtonVisibilityChanged(views::View* button_view) { |
| 565 if (status_area_) | 565 if (status_area_) |
| 566 status_area_->UpdateButtonVisibility(); | 566 status_area_->UpdateButtonVisibility(); |
| 567 } | 567 } |
| 568 | 568 |
| 569 // BrowserView, MessageLoopForUI::Observer implementation. | 569 // BrowserView, MessageLoopForUI::Observer implementation. |
| 570 | 570 |
| 571 #if defined(TOUCH_UI) || defined(USE_AURA) | 571 #if defined(USE_AURA) |
| 572 base::EventStatus BrowserView::WillProcessEvent( | 572 base::EventStatus BrowserView::WillProcessEvent( |
| 573 const base::NativeEvent& event) OVERRIDE { | 573 const base::NativeEvent& event) OVERRIDE { |
| 574 return base::EVENT_CONTINUE; | 574 return base::EVENT_CONTINUE; |
| 575 } | 575 } |
| 576 | 576 |
| 577 void BrowserView::DidProcessEvent(const base::NativeEvent& event) OVERRIDE { | 577 void BrowserView::DidProcessEvent(const base::NativeEvent& event) OVERRIDE { |
| 578 // TODO(oshima): On Aura, WM should notify chrome someshow. | 578 // TODO(oshima): On Aura, WM should notify chrome someshow. |
| 579 } | 579 } |
| 580 #else | 580 #else |
| 581 void BrowserView::DidProcessEvent(GdkEvent* event) { | 581 void BrowserView::DidProcessEvent(GdkEvent* event) { |
| (...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 657 BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser) { | 657 BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser) { |
| 658 // Create a browser view for chromeos. | 658 // Create a browser view for chromeos. |
| 659 BrowserView* view; | 659 BrowserView* view; |
| 660 if (browser->is_type_popup() || browser->is_type_panel()) | 660 if (browser->is_type_popup() || browser->is_type_panel()) |
| 661 view = new chromeos::PanelBrowserView(browser); | 661 view = new chromeos::PanelBrowserView(browser); |
| 662 else | 662 else |
| 663 view = new chromeos::BrowserView(browser); | 663 view = new chromeos::BrowserView(browser); |
| 664 (new BrowserFrame(view))->InitBrowserFrame(); | 664 (new BrowserFrame(view))->InitBrowserFrame(); |
| 665 return view; | 665 return view; |
| 666 } | 666 } |
| OLD | NEW |