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/browser_view.h" | 5 #include "chrome/browser/chromeos/browser_view.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <string> | 8 #include <string> |
9 | 9 |
10 #include "app/gfx/canvas.h" | 10 #include "app/gfx/canvas.h" |
11 #include "app/menus/simple_menu_model.h" | 11 #include "app/menus/simple_menu_model.h" |
12 #include "app/theme_provider.h" | 12 #include "app/theme_provider.h" |
13 #include "base/command_line.h" | 13 #include "base/command_line.h" |
14 #include "chrome/app/chrome_dll_resource.h" | 14 #include "chrome/app/chrome_dll_resource.h" |
15 #include "chrome/browser/chromeos/browser_status_area_view.h" | 15 #include "chrome/browser/chromeos/browser_status_area_view.h" |
16 #include "chrome/browser/chromeos/compact_location_bar_host.h" | 16 #include "chrome/browser/chromeos/compact_location_bar_host.h" |
17 #include "chrome/browser/chromeos/compact_navigation_bar.h" | 17 #include "chrome/browser/chromeos/compact_navigation_bar.h" |
18 #include "chrome/browser/chromeos/main_menu.h" | 18 #include "chrome/browser/chromeos/main_menu.h" |
19 #include "chrome/browser/chromeos/panel_browser_view.h" | 19 #include "chrome/browser/chromeos/panel_browser_view.h" |
20 #include "chrome/browser/chromeos/status_area_button.h" | 20 #include "chrome/browser/chromeos/status_area_button.h" |
21 #include "chrome/browser/view_ids.h" | 21 #include "chrome/browser/view_ids.h" |
22 #include "chrome/browser/views/frame/browser_extender.h" | 22 #include "chrome/browser/views/frame/browser_extender.h" |
23 #include "chrome/browser/views/frame/browser_frame_gtk.h" | 23 #include "chrome/browser/views/frame/browser_frame_gtk.h" |
24 #include "chrome/browser/views/frame/browser_view.h" | 24 #include "chrome/browser/views/frame/browser_view.h" |
25 #include "chrome/browser/views/frame/browser_view_layout.h" | 25 #include "chrome/browser/views/frame/browser_view_layout.h" |
26 #include "chrome/browser/views/tabs/tab.h" | 26 #include "chrome/browser/views/tabs/tab.h" |
27 #include "chrome/browser/views/tabs/tab_overview_types.h" | 27 #include "chrome/browser/views/tabs/tab_overview_types.h" |
28 #include "chrome/browser/views/tabs/tab_strip.h" | 28 #include "chrome/browser/views/tabs/tab_strip.h" |
29 #include "chrome/browser/views/toolbar_view.h" | 29 #include "chrome/browser/views/toolbar_view.h" |
| 30 #include "chrome/browser/views/toolbar_star_toggle.h" |
30 #include "chrome/common/chrome_switches.h" | 31 #include "chrome/common/chrome_switches.h" |
31 #include "chrome/common/x11_util.h" | 32 #include "chrome/common/x11_util.h" |
32 #include "grit/generated_resources.h" | 33 #include "grit/generated_resources.h" |
33 #include "grit/theme_resources.h" | 34 #include "grit/theme_resources.h" |
34 #include "views/controls/button/button.h" | 35 #include "views/controls/button/button.h" |
35 #include "views/controls/button/image_button.h" | 36 #include "views/controls/button/image_button.h" |
36 #include "views/controls/menu/menu_2.h" | 37 #include "views/controls/menu/menu_2.h" |
37 #include "views/window/hit_test.h" | 38 #include "views/window/hit_test.h" |
38 #include "views/window/window.h" | 39 #include "views/window/window.h" |
39 | 40 |
(...skipping 381 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
421 | 422 |
422 views::LayoutManager* BrowserView::CreateLayoutManager() const { | 423 views::LayoutManager* BrowserView::CreateLayoutManager() const { |
423 return new BrowserViewLayout(); | 424 return new BrowserViewLayout(); |
424 } | 425 } |
425 | 426 |
426 TabStrip* BrowserView::CreateTabStrip( | 427 TabStrip* BrowserView::CreateTabStrip( |
427 TabStripModel* tab_strip_model) { | 428 TabStripModel* tab_strip_model) { |
428 return new ChromeosTabStrip(tab_strip_model, this); | 429 return new ChromeosTabStrip(tab_strip_model, this); |
429 } | 430 } |
430 | 431 |
| 432 void BrowserView::SetStarredState(bool is_starred) { |
| 433 ::BrowserView::SetStarredState(is_starred); |
| 434 compact_location_bar_host_->GetStarButton()->SetToggled(is_starred); |
| 435 } |
| 436 |
| 437 void BrowserView::ShowBookmarkBubble(const GURL& url, bool already_bookmarked) { |
| 438 if (is_compact_style()) |
| 439 compact_location_bar_host_->GetStarButton()->ShowStarBubble( |
| 440 url, !already_bookmarked); |
| 441 else |
| 442 ::BrowserView::ShowBookmarkBubble(url, already_bookmarked); |
| 443 } |
| 444 |
431 // views::ButtonListener overrides. | 445 // views::ButtonListener overrides. |
432 void BrowserView::ButtonPressed(views::Button* sender, | 446 void BrowserView::ButtonPressed(views::Button* sender, |
433 const views::Event& event) { | 447 const views::Event& event) { |
434 chromeos::MainMenu::Show(browser()); | 448 chromeos::MainMenu::Show(browser()); |
435 } | 449 } |
436 | 450 |
437 // views::ContextMenuController overrides. | 451 // views::ContextMenuController overrides. |
438 void BrowserView::ShowContextMenu(views::View* source, int x, int y, | 452 void BrowserView::ShowContextMenu(views::View* source, int x, int y, |
439 bool is_mouse_gesture) { | 453 bool is_mouse_gesture) { |
440 system_menu_menu_->RunMenuAt(gfx::Point(x, y), views::Menu2::ALIGN_TOPLEFT); | 454 system_menu_menu_->RunMenuAt(gfx::Point(x, y), views::Menu2::ALIGN_TOPLEFT); |
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
493 BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser) { | 507 BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser) { |
494 // Create a browser view for chromeos. | 508 // Create a browser view for chromeos. |
495 BrowserView* view; | 509 BrowserView* view; |
496 if (browser->type() & Browser::TYPE_POPUP) | 510 if (browser->type() & Browser::TYPE_POPUP) |
497 view = new chromeos::PanelBrowserView(browser); | 511 view = new chromeos::PanelBrowserView(browser); |
498 else | 512 else |
499 view = new chromeos::BrowserView(browser); | 513 view = new chromeos::BrowserView(browser); |
500 BrowserFrame::Create(view, browser->profile()); | 514 BrowserFrame::Create(view, browser->profile()); |
501 return view; | 515 return view; |
502 } | 516 } |
OLD | NEW |