| 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/debugger/devtools_window.h" | 26 #include "chrome/browser/debugger/devtools_window.h" |
| 26 #include "chrome/browser/download/download_manager.h" | 27 #include "chrome/browser/download/download_manager.h" |
| 27 #include "chrome/browser/find_bar.h" | 28 #include "chrome/browser/find_bar.h" |
| 28 #include "chrome/browser/find_bar_controller.h" | 29 #include "chrome/browser/find_bar_controller.h" |
| 29 #include "chrome/browser/profile.h" | 30 #include "chrome/browser/profile.h" |
| 30 #include "chrome/browser/view_ids.h" | 31 #include "chrome/browser/view_ids.h" |
| 31 #include "chrome/browser/views/bookmark_bar_view.h" | 32 #include "chrome/browser/views/bookmark_bar_view.h" |
| 32 #include "chrome/browser/views/browser_bubble.h" | 33 #include "chrome/browser/views/browser_bubble.h" |
| 33 #include "chrome/browser/views/browser_dialogs.h" | 34 #include "chrome/browser/views/browser_dialogs.h" |
| 34 #include "chrome/browser/views/chrome_views_delegate.h" | 35 #include "chrome/browser/views/chrome_views_delegate.h" |
| (...skipping 1406 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1441 infobar_container_ = new InfoBarContainer(this); | 1442 infobar_container_ = new InfoBarContainer(this); |
| 1442 AddChildView(infobar_container_); | 1443 AddChildView(infobar_container_); |
| 1443 | 1444 |
| 1444 contents_container_ = new TabContentsContainer; | 1445 contents_container_ = new TabContentsContainer; |
| 1445 devtools_container_ = new TabContentsContainer; | 1446 devtools_container_ = new TabContentsContainer; |
| 1446 devtools_container_->SetVisible(false); | 1447 devtools_container_->SetVisible(false); |
| 1447 contents_split_ = new views::SingleSplitView( | 1448 contents_split_ = new views::SingleSplitView( |
| 1448 contents_container_, | 1449 contents_container_, |
| 1449 devtools_container_, | 1450 devtools_container_, |
| 1450 views::SingleSplitView::VERTICAL_SPLIT); | 1451 views::SingleSplitView::VERTICAL_SPLIT); |
| 1452 SkColor bg_color = GetWidget()->GetThemeProvider()-> |
| 1453 GetColor(BrowserThemeProvider::COLOR_TOOLBAR); |
| 1454 contents_split_->set_background( |
| 1455 views::Background::CreateSolidBackground(bg_color)); |
| 1451 AddChildView(contents_split_); | 1456 AddChildView(contents_split_); |
| 1452 set_contents_view(contents_split_); | 1457 set_contents_view(contents_split_); |
| 1453 | 1458 |
| 1454 status_bubble_.reset(new StatusBubbleViews(GetWidget())); | 1459 status_bubble_.reset(new StatusBubbleViews(GetWidget())); |
| 1455 | 1460 |
| 1456 extension_shelf_ = new ExtensionShelf(browser_.get()); | 1461 extension_shelf_ = new ExtensionShelf(browser_.get()); |
| 1457 AddChildView(extension_shelf_); | 1462 AddChildView(extension_shelf_); |
| 1458 | 1463 |
| 1459 #if defined(OS_WIN) | 1464 #if defined(OS_WIN) |
| 1460 InitSystemMenu(); | 1465 InitSystemMenu(); |
| (...skipping 404 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1865 | 1870 |
| 1866 // static | 1871 // static |
| 1867 FindBar* BrowserWindow::CreateFindBar(Browser* browser) { | 1872 FindBar* BrowserWindow::CreateFindBar(Browser* browser) { |
| 1868 return browser::CreateFindBar(static_cast<BrowserView*>(browser->window())); | 1873 return browser::CreateFindBar(static_cast<BrowserView*>(browser->window())); |
| 1869 } | 1874 } |
| 1870 | 1875 |
| 1871 // static | 1876 // static |
| 1872 void BrowserList::AllBrowsersClosed() { | 1877 void BrowserList::AllBrowsersClosed() { |
| 1873 views::Window::CloseAllSecondaryWindows(); | 1878 views::Window::CloseAllSecondaryWindows(); |
| 1874 } | 1879 } |
| OLD | NEW |