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 |
11 #include "app/menus/simple_menu_model.h" | 11 #include "app/menus/simple_menu_model.h" |
12 #include "base/command_line.h" | 12 #include "base/command_line.h" |
13 #include "chrome/app/chrome_dll_resource.h" | 13 #include "chrome/app/chrome_dll_resource.h" |
14 #include "chrome/browser/chromeos/frame/panel_browser_view.h" | 14 #include "chrome/browser/chromeos/frame/panel_browser_view.h" |
15 #include "chrome/browser/chromeos/status/status_area_view.h" | |
16 #include "chrome/browser/chromeos/status/language_menu_button.h" | 15 #include "chrome/browser/chromeos/status/language_menu_button.h" |
17 #include "chrome/browser/chromeos/status/network_menu_button.h" | 16 #include "chrome/browser/chromeos/status/network_menu_button.h" |
18 #include "chrome/browser/chromeos/status/status_area_button.h" | 17 #include "chrome/browser/chromeos/status/status_area_button.h" |
| 18 #include "chrome/browser/chromeos/status/status_area_view.h" |
19 #include "chrome/browser/chromeos/view_ids.h" | 19 #include "chrome/browser/chromeos/view_ids.h" |
20 #include "chrome/browser/chromeos/wm_ipc.h" | 20 #include "chrome/browser/chromeos/wm_ipc.h" |
21 #include "chrome/browser/views/app_launcher.h" | 21 #include "chrome/browser/views/app_launcher.h" |
22 #include "chrome/browser/views/frame/browser_frame_gtk.h" | 22 #include "chrome/browser/views/frame/browser_frame_gtk.h" |
23 #include "chrome/browser/views/frame/browser_view.h" | 23 #include "chrome/browser/views/frame/browser_view.h" |
24 #include "chrome/browser/views/frame/browser_view_layout.h" | 24 #include "chrome/browser/views/frame/browser_view_layout.h" |
25 #include "chrome/browser/views/tabs/tab.h" | 25 #include "chrome/browser/views/tabs/tab.h" |
26 #include "chrome/browser/views/tabs/tab_strip.h" | 26 #include "chrome/browser/views/tabs/tab_strip.h" |
27 #include "chrome/browser/views/theme_background.h" | 27 #include "chrome/browser/views/theme_background.h" |
28 #include "chrome/browser/views/toolbar_view.h" | 28 #include "chrome/browser/views/toolbar_view.h" |
29 #include "chrome/common/chrome_switches.h" | 29 #include "chrome/common/chrome_switches.h" |
| 30 #include "cros/chromeos_wm_ipc_enums.h" |
30 #include "gfx/canvas.h" | 31 #include "gfx/canvas.h" |
31 #include "grit/generated_resources.h" | 32 #include "grit/generated_resources.h" |
32 #include "cros/chromeos_wm_ipc_enums.h" | |
33 #include "views/controls/button/button.h" | 33 #include "views/controls/button/button.h" |
34 #include "views/controls/button/image_button.h" | 34 #include "views/controls/button/image_button.h" |
35 #include "views/controls/menu/menu_2.h" | 35 #include "views/controls/menu/menu_2.h" |
36 #include "views/screen.h" | 36 #include "views/screen.h" |
37 #include "views/widget/root_view.h" | 37 #include "views/widget/root_view.h" |
38 #include "views/window/hit_test.h" | 38 #include "views/window/hit_test.h" |
39 #include "views/window/window.h" | 39 #include "views/window/window.h" |
40 | 40 |
41 namespace { | 41 namespace { |
42 | 42 |
(...skipping 326 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
369 BrowserView* view; | 369 BrowserView* view; |
370 if ((browser->type() == Browser::TYPE_POPUP) || | 370 if ((browser->type() == Browser::TYPE_POPUP) || |
371 (browser->type() == Browser::TYPE_APP_POPUP) || | 371 (browser->type() == Browser::TYPE_APP_POPUP) || |
372 (browser->type() == Browser::TYPE_APP_PANEL)) | 372 (browser->type() == Browser::TYPE_APP_PANEL)) |
373 view = new chromeos::PanelBrowserView(browser); | 373 view = new chromeos::PanelBrowserView(browser); |
374 else | 374 else |
375 view = new chromeos::BrowserView(browser); | 375 view = new chromeos::BrowserView(browser); |
376 BrowserFrame::Create(view, browser->profile()); | 376 BrowserFrame::Create(view, browser->profile()); |
377 return view; | 377 return view; |
378 } | 378 } |
OLD | NEW |