| OLD | NEW |
| 1 // Copyright (c) 2006-2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2009 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/views/frame/browser_view.h" | 5 #include "chrome/browser/views/frame/browser_view.h" |
| 6 | 6 |
| 7 #if defined(OS_LINUX) | 7 #if defined(OS_LINUX) |
| 8 #include <gtk/gtk.h> | 8 #include <gtk/gtk.h> |
| 9 #endif | 9 #endif |
| 10 | 10 |
| 11 #include "app/drag_drop_types.h" | 11 #include "app/drag_drop_types.h" |
| 12 #include "app/gfx/canvas.h" | 12 #include "app/gfx/canvas.h" |
| 13 #include "app/l10n_util.h" | 13 #include "app/l10n_util.h" |
| 14 #include "app/os_exchange_data.h" | 14 #include "app/os_exchange_data.h" |
| 15 #include "app/resource_bundle.h" | 15 #include "app/resource_bundle.h" |
| 16 #include "base/command_line.h" | 16 #include "base/command_line.h" |
| 17 #include "base/time.h" | 17 #include "base/time.h" |
| 18 #include "build/build_config.h" | 18 #include "build/build_config.h" |
| 19 #include "chrome/app/chrome_dll_resource.h" | 19 #include "chrome/app/chrome_dll_resource.h" |
| 20 #include "chrome/browser/app_modal_dialog_queue.h" | 20 #include "chrome/browser/app_modal_dialog_queue.h" |
| 21 #include "chrome/browser/bookmarks/bookmark_utils.h" | 21 #include "chrome/browser/bookmarks/bookmark_utils.h" |
| 22 #include "chrome/browser/browser.h" | 22 #include "chrome/browser/browser.h" |
| 23 #include "chrome/browser/browser_list.h" | 23 #include "chrome/browser/browser_list.h" |
| 24 #include "chrome/browser/browser_process.h" | 24 #include "chrome/browser/browser_process.h" |
| 25 #include "chrome/browser/browser_theme_provider.h" | 25 #include "chrome/browser/browser_theme_provider.h" |
| 26 #include "chrome/browser/debugger/devtools_window.h" | 26 #include "chrome/browser/debugger/devtools_window.h" |
| 27 #include "chrome/browser/download/download_manager.h" | 27 #include "chrome/browser/download/download_manager.h" |
| 28 #include "chrome/browser/find_bar.h" | 28 #include "chrome/browser/find_bar.h" |
| 29 #include "chrome/browser/find_bar_controller.h" | 29 #include "chrome/browser/find_bar_controller.h" |
| 30 #if defined(OS_WIN) |
| 31 #include "chrome/browser/jumplist.h" |
| 32 #endif |
| 30 #include "chrome/browser/profile.h" | 33 #include "chrome/browser/profile.h" |
| 31 #include "chrome/browser/view_ids.h" | 34 #include "chrome/browser/view_ids.h" |
| 32 #include "chrome/browser/views/bookmark_bar_view.h" | 35 #include "chrome/browser/views/bookmark_bar_view.h" |
| 33 #include "chrome/browser/views/browser_bubble.h" | 36 #include "chrome/browser/views/browser_bubble.h" |
| 34 #include "chrome/browser/views/browser_dialogs.h" | 37 #include "chrome/browser/views/browser_dialogs.h" |
| 35 #include "chrome/browser/views/chrome_views_delegate.h" | 38 #include "chrome/browser/views/chrome_views_delegate.h" |
| 36 #include "chrome/browser/views/download_shelf_view.h" | 39 #include "chrome/browser/views/download_shelf_view.h" |
| 37 #include "chrome/browser/views/extensions/extension_shelf.h" | 40 #include "chrome/browser/views/extensions/extension_shelf.h" |
| 38 #include "chrome/browser/views/frame/browser_frame.h" | 41 #include "chrome/browser/views/frame/browser_frame.h" |
| 39 #include "chrome/browser/views/fullscreen_exit_bubble.h" | 42 #include "chrome/browser/views/fullscreen_exit_bubble.h" |
| (...skipping 1434 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1474 | 1477 |
| 1475 status_bubble_.reset(new StatusBubbleViews(GetWidget())); | 1478 status_bubble_.reset(new StatusBubbleViews(GetWidget())); |
| 1476 | 1479 |
| 1477 extension_shelf_ = new ExtensionShelf(browser_.get()); | 1480 extension_shelf_ = new ExtensionShelf(browser_.get()); |
| 1478 extension_shelf_-> | 1481 extension_shelf_-> |
| 1479 SetAccessibleName(l10n_util::GetString(IDS_ACCNAME_EXTENSIONS)); | 1482 SetAccessibleName(l10n_util::GetString(IDS_ACCNAME_EXTENSIONS)); |
| 1480 AddChildView(extension_shelf_); | 1483 AddChildView(extension_shelf_); |
| 1481 | 1484 |
| 1482 #if defined(OS_WIN) | 1485 #if defined(OS_WIN) |
| 1483 InitSystemMenu(); | 1486 InitSystemMenu(); |
| 1487 |
| 1488 // Create a custom JumpList and add it to an observer of TabRestoreService |
| 1489 // so we can update the custom JumpList when a tab is added or removed. |
| 1490 if (JumpList::Enabled()) { |
| 1491 jumplist_.reset(new JumpList); |
| 1492 jumplist_->AddObserver(browser_->profile()); |
| 1493 } |
| 1484 #endif | 1494 #endif |
| 1485 } | 1495 } |
| 1486 | 1496 |
| 1487 #if defined(OS_WIN) | 1497 #if defined(OS_WIN) |
| 1488 void BrowserView::InitSystemMenu() { | 1498 void BrowserView::InitSystemMenu() { |
| 1489 system_menu_contents_.reset(new views::SystemMenuModel(this)); | 1499 system_menu_contents_.reset(new views::SystemMenuModel(this)); |
| 1490 // We add the menu items in reverse order so that insertion_index never needs | 1500 // We add the menu items in reverse order so that insertion_index never needs |
| 1491 // to change. | 1501 // to change. |
| 1492 if (IsBrowserTypeNormal()) | 1502 if (IsBrowserTypeNormal()) |
| 1493 BuildSystemMenuForBrowserWindow(); | 1503 BuildSystemMenuForBrowserWindow(); |
| (...skipping 419 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1913 | 1923 |
| 1914 // static | 1924 // static |
| 1915 FindBar* BrowserWindow::CreateFindBar(Browser* browser) { | 1925 FindBar* BrowserWindow::CreateFindBar(Browser* browser) { |
| 1916 return browser::CreateFindBar(static_cast<BrowserView*>(browser->window())); | 1926 return browser::CreateFindBar(static_cast<BrowserView*>(browser->window())); |
| 1917 } | 1927 } |
| 1918 | 1928 |
| 1919 // static | 1929 // static |
| 1920 void BrowserList::AllBrowsersClosed() { | 1930 void BrowserList::AllBrowsersClosed() { |
| 1921 views::Window::CloseAllSecondaryWindows(); | 1931 views::Window::CloseAllSecondaryWindows(); |
| 1922 } | 1932 } |
| OLD | NEW |