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 <string> | 8 #include <string> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 334 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
345 void BrowserView::OpenButtonOptions(const views::View* button_view) { | 345 void BrowserView::OpenButtonOptions(const views::View* button_view) { |
346 if (button_view == status_area_->network_view()) { | 346 if (button_view == status_area_->network_view()) { |
347 browser()->OpenInternetOptionsDialog(); | 347 browser()->OpenInternetOptionsDialog(); |
348 } else if (button_view == status_area_->input_method_view()) { | 348 } else if (button_view == status_area_->input_method_view()) { |
349 browser()->OpenLanguageOptionsDialog(); | 349 browser()->OpenLanguageOptionsDialog(); |
350 } else { | 350 } else { |
351 browser()->OpenSystemOptionsDialog(); | 351 browser()->OpenSystemOptionsDialog(); |
352 } | 352 } |
353 } | 353 } |
354 | 354 |
355 bool BrowserView::IsBrowserMode() const { | 355 StatusAreaHost::ScreenMode BrowserView::GetScreenMode() const { |
356 return true; | 356 return kBrowserMode; |
357 } | |
358 | |
359 bool BrowserView::IsScreenLockerMode() const { | |
360 return false; | |
361 } | 357 } |
362 | 358 |
363 //////////////////////////////////////////////////////////////////////////////// | 359 //////////////////////////////////////////////////////////////////////////////// |
364 // BrowserView protected: | 360 // BrowserView protected: |
365 | 361 |
366 void BrowserView::GetAccessiblePanes( | 362 void BrowserView::GetAccessiblePanes( |
367 std::vector<AccessiblePaneView*>* panes) { | 363 std::vector<AccessiblePaneView*>* panes) { |
368 ::BrowserView::GetAccessiblePanes(panes); | 364 ::BrowserView::GetAccessiblePanes(panes); |
369 panes->push_back(status_area_); | 365 panes->push_back(status_area_); |
370 } | 366 } |
(...skipping 18 matching lines...) Expand all Loading... |
389 BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser) { | 385 BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser) { |
390 // Create a browser view for chromeos. | 386 // Create a browser view for chromeos. |
391 BrowserView* view; | 387 BrowserView* view; |
392 if (browser->type() & Browser::TYPE_POPUP) | 388 if (browser->type() & Browser::TYPE_POPUP) |
393 view = new chromeos::PanelBrowserView(browser); | 389 view = new chromeos::PanelBrowserView(browser); |
394 else | 390 else |
395 view = new chromeos::BrowserView(browser); | 391 view = new chromeos::BrowserView(browser); |
396 BrowserFrame::Create(view, browser->profile()); | 392 BrowserFrame::Create(view, browser->profile()); |
397 return view; | 393 return view; |
398 } | 394 } |
OLD | NEW |