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 <set> | 8 #include <set> |
9 #include <string> | 9 #include <string> |
10 #include <vector> | 10 #include <vector> |
11 | 11 |
12 #include "base/command_line.h" | 12 #include "base/command_line.h" |
13 #include "chrome/app/chrome_command_ids.h" | 13 #include "chrome/app/chrome_command_ids.h" |
14 #include "chrome/browser/chromeos/frame/layout_mode_button.h" | 14 #include "chrome/browser/chromeos/frame/layout_mode_button.h" |
15 #include "chrome/browser/chromeos/frame/panel_browser_view.h" | 15 #include "chrome/browser/chromeos/frame/panel_browser_view.h" |
16 #include "chrome/browser/chromeos/status/input_method_menu_button.h" | 16 #include "chrome/browser/chromeos/status/input_method_menu_button.h" |
17 #include "chrome/browser/chromeos/status/network_menu_button.h" | 17 #include "chrome/browser/chromeos/status/network_menu_button.h" |
18 #include "chrome/browser/chromeos/status/status_area_button.h" | 18 #include "chrome/browser/chromeos/status/status_area_button.h" |
19 #include "chrome/browser/chromeos/status/status_area_view.h" | 19 #include "chrome/browser/chromeos/status/status_area_view.h" |
20 #include "chrome/browser/chromeos/view_ids.h" | 20 #include "chrome/browser/chromeos/view_ids.h" |
21 #include "chrome/browser/chromeos/wm_ipc.h" | 21 #include "chrome/browser/chromeos/wm_ipc.h" |
22 #include "chrome/browser/themes/theme_service_factory.h" | 22 #include "chrome/browser/themes/theme_service_factory.h" |
23 #include "chrome/browser/themes/theme_service.h" | 23 #include "chrome/browser/themes/theme_service.h" |
24 #include "chrome/browser/ui/gtk/gtk_util.h" | 24 #include "chrome/browser/ui/gtk/gtk_util.h" |
25 #include "chrome/browser/ui/views/frame/browser_frame_gtk.h" | |
26 #include "chrome/browser/ui/views/frame/browser_view.h" | 25 #include "chrome/browser/ui/views/frame/browser_view.h" |
27 #include "chrome/browser/ui/views/frame/browser_view_layout.h" | 26 #include "chrome/browser/ui/views/frame/browser_view_layout.h" |
28 #include "chrome/browser/ui/views/tabs/tab.h" | 27 #include "chrome/browser/ui/views/tabs/tab.h" |
29 #include "chrome/browser/ui/views/tabs/tab_strip.h" | 28 #include "chrome/browser/ui/views/tabs/tab_strip.h" |
30 #include "chrome/browser/ui/views/theme_background.h" | 29 #include "chrome/browser/ui/views/theme_background.h" |
31 #include "chrome/browser/ui/views/toolbar_view.h" | 30 #include "chrome/browser/ui/views/toolbar_view.h" |
32 #include "chrome/common/chrome_switches.h" | 31 #include "chrome/common/chrome_switches.h" |
33 #include "grit/generated_resources.h" | 32 #include "grit/generated_resources.h" |
34 #include "grit/theme_resources_standard.h" | 33 #include "grit/theme_resources_standard.h" |
35 #include "third_party/cros/chromeos_wm_ipc_enums.h" | 34 #include "third_party/cros/chromeos_wm_ipc_enums.h" |
(...skipping 630 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
666 BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser) { | 665 BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser) { |
667 // Create a browser view for chromeos. | 666 // Create a browser view for chromeos. |
668 BrowserView* view; | 667 BrowserView* view; |
669 if (browser->is_type_popup() || browser->is_type_panel()) | 668 if (browser->is_type_popup() || browser->is_type_panel()) |
670 view = new chromeos::PanelBrowserView(browser); | 669 view = new chromeos::PanelBrowserView(browser); |
671 else | 670 else |
672 view = new chromeos::BrowserView(browser); | 671 view = new chromeos::BrowserView(browser); |
673 (new BrowserFrame(view))->InitBrowserFrame(); | 672 (new BrowserFrame(view))->InitBrowserFrame(); |
674 return view; | 673 return view; |
675 } | 674 } |
OLD | NEW |