OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 300 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
311 | 311 |
312 bool BrowserView::ShouldOpenButtonOptions( | 312 bool BrowserView::ShouldOpenButtonOptions( |
313 const views::View* button_view) const { | 313 const views::View* button_view) const { |
314 return true; | 314 return true; |
315 } | 315 } |
316 | 316 |
317 void BrowserView::ExecuteBrowserCommand(int id) const { | 317 void BrowserView::ExecuteBrowserCommand(int id) const { |
318 browser()->ExecuteCommand(id); | 318 browser()->ExecuteCommand(id); |
319 } | 319 } |
320 | 320 |
321 void BrowserView::OpenButtonOptions(const views::View* button_view) const { | 321 void BrowserView::OpenButtonOptions(const views::View* button_view) { |
322 if (button_view == status_area_->network_view()) { | 322 if (button_view == status_area_->network_view()) { |
323 browser()->OpenInternetOptionsDialog(); | 323 browser()->OpenInternetOptionsDialog(); |
324 } else if (button_view == status_area_->input_method_view()) { | 324 } else if (button_view == status_area_->input_method_view()) { |
325 browser()->OpenLanguageOptionsDialog(); | 325 browser()->OpenLanguageOptionsDialog(); |
326 } else { | 326 } else { |
327 browser()->OpenSystemOptionsDialog(); | 327 browser()->OpenSystemOptionsDialog(); |
328 } | 328 } |
329 } | 329 } |
330 | 330 |
331 bool BrowserView::IsBrowserMode() const { | 331 bool BrowserView::IsBrowserMode() const { |
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
365 BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser) { | 365 BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser) { |
366 // Create a browser view for chromeos. | 366 // Create a browser view for chromeos. |
367 BrowserView* view; | 367 BrowserView* view; |
368 if (browser->type() & Browser::TYPE_POPUP) | 368 if (browser->type() & Browser::TYPE_POPUP) |
369 view = new chromeos::PanelBrowserView(browser); | 369 view = new chromeos::PanelBrowserView(browser); |
370 else | 370 else |
371 view = new chromeos::BrowserView(browser); | 371 view = new chromeos::BrowserView(browser); |
372 BrowserFrame::Create(view, browser->profile()); | 372 BrowserFrame::Create(view, browser->profile()); |
373 return view; | 373 return view; |
374 } | 374 } |
OLD | NEW |