| 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 335 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 346 // global namespace. Check the chrome/browser/ui/views/frame/browser_view.h | 346 // global namespace. Check the chrome/browser/ui/views/frame/browser_view.h |
| 347 // file for details. | 347 // file for details. |
| 348 return static_cast<chromeos::BrowserView*>( | 348 return static_cast<chromeos::BrowserView*>( |
| 349 ::BrowserView::GetBrowserViewForBrowser(browser)); | 349 ::BrowserView::GetBrowserViewForBrowser(browser)); |
| 350 } | 350 } |
| 351 | 351 |
| 352 // BrowserView, ::BrowserView overrides: | 352 // BrowserView, ::BrowserView overrides: |
| 353 | 353 |
| 354 void BrowserView::Init() { | 354 void BrowserView::Init() { |
| 355 ::BrowserView::Init(); | 355 ::BrowserView::Init(); |
| 356 StatusAreaViewChromeos::screen_mode = StatusAreaViewChromeos::BROWSER_MODE; |
| 356 status_area_ = new StatusAreaViewChromeos(); | 357 status_area_ = new StatusAreaViewChromeos(); |
| 357 status_area_->Init(this, StatusAreaViewChromeos::BROWSER_MODE); | 358 status_area_->Init(this); |
| 358 status_area_->set_id(VIEW_ID_STATUS_AREA); | 359 status_area_->set_id(VIEW_ID_STATUS_AREA); |
| 359 AddChildView(status_area_); | 360 AddChildView(status_area_); |
| 360 | 361 |
| 361 layout_mode_button_ = new LayoutModeButton(); | 362 layout_mode_button_ = new LayoutModeButton(); |
| 362 layout_mode_button_->set_id(VIEW_ID_LAYOUT_MODE_BUTTON); | 363 layout_mode_button_->set_id(VIEW_ID_LAYOUT_MODE_BUTTON); |
| 363 AddChildView(layout_mode_button_); | 364 AddChildView(layout_mode_button_); |
| 364 layout_mode_button_->Init(); | 365 layout_mode_button_->Init(); |
| 365 | 366 |
| 366 frame()->non_client_view()->set_context_menu_controller(this); | 367 frame()->non_client_view()->set_context_menu_controller(this); |
| 367 | 368 |
| (...skipping 292 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 660 BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser) { | 661 BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser) { |
| 661 // Create a browser view for chromeos. | 662 // Create a browser view for chromeos. |
| 662 BrowserView* view; | 663 BrowserView* view; |
| 663 if (browser->is_type_popup() || browser->is_type_panel()) | 664 if (browser->is_type_popup() || browser->is_type_panel()) |
| 664 view = new chromeos::PanelBrowserView(browser); | 665 view = new chromeos::PanelBrowserView(browser); |
| 665 else | 666 else |
| 666 view = new chromeos::BrowserView(browser); | 667 view = new chromeos::BrowserView(browser); |
| 667 (new BrowserFrame(view))->InitBrowserFrame(); | 668 (new BrowserFrame(view))->InitBrowserFrame(); |
| 668 return view; | 669 return view; |
| 669 } | 670 } |
| OLD | NEW |