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> |
(...skipping 19 matching lines...) Expand all Loading... |
30 #include "chrome/common/chrome_switches.h" | 30 #include "chrome/common/chrome_switches.h" |
31 #include "grit/generated_resources.h" | 31 #include "grit/generated_resources.h" |
32 #include "grit/theme_resources_standard.h" | 32 #include "grit/theme_resources_standard.h" |
33 #include "third_party/cros_system_api/window_manager/chromeos_wm_ipc_enums.h" | 33 #include "third_party/cros_system_api/window_manager/chromeos_wm_ipc_enums.h" |
34 #include "ui/base/hit_test.h" | 34 #include "ui/base/hit_test.h" |
35 #include "ui/base/l10n/l10n_util.h" | 35 #include "ui/base/l10n/l10n_util.h" |
36 #include "ui/base/models/simple_menu_model.h" | 36 #include "ui/base/models/simple_menu_model.h" |
37 #include "ui/base/theme_provider.h" | 37 #include "ui/base/theme_provider.h" |
38 #include "ui/gfx/canvas.h" | 38 #include "ui/gfx/canvas.h" |
39 #include "ui/gfx/screen.h" | 39 #include "ui/gfx/screen.h" |
| 40 #include "ui/views/widget/root_view.h" |
| 41 #include "ui/views/widget/widget.h" |
40 #include "views/controls/button/button.h" | 42 #include "views/controls/button/button.h" |
41 #include "views/controls/button/image_button.h" | 43 #include "views/controls/button/image_button.h" |
42 #include "views/controls/menu/menu_delegate.h" | 44 #include "views/controls/menu/menu_delegate.h" |
43 #include "views/controls/menu/menu_item_view.h" | 45 #include "views/controls/menu/menu_item_view.h" |
44 #include "views/controls/menu/menu_runner.h" | 46 #include "views/controls/menu/menu_runner.h" |
45 #include "views/widget/root_view.h" | |
46 #include "views/widget/widget.h" | |
47 | 47 |
48 #if defined(TOOLKIT_USES_GTK) | 48 #if defined(TOOLKIT_USES_GTK) |
49 #include "chrome/browser/chromeos/legacy_window_manager/wm_ipc.h" | 49 #include "chrome/browser/chromeos/legacy_window_manager/wm_ipc.h" |
50 #endif | 50 #endif |
51 | 51 |
52 namespace { | 52 namespace { |
53 | 53 |
54 // Amount to tweak the position of the status area to get it to look right. | 54 // Amount to tweak the position of the status area to get it to look right. |
55 const int kStatusAreaVerticalAdjustment = -1; | 55 const int kStatusAreaVerticalAdjustment = -1; |
56 | 56 |
(...skipping 600 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
657 BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser) { | 657 BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser) { |
658 // Create a browser view for chromeos. | 658 // Create a browser view for chromeos. |
659 BrowserView* view; | 659 BrowserView* view; |
660 if (browser->is_type_popup() || browser->is_type_panel()) | 660 if (browser->is_type_popup() || browser->is_type_panel()) |
661 view = new chromeos::PanelBrowserView(browser); | 661 view = new chromeos::PanelBrowserView(browser); |
662 else | 662 else |
663 view = new chromeos::BrowserView(browser); | 663 view = new chromeos::BrowserView(browser); |
664 (new BrowserFrame(view))->InitBrowserFrame(); | 664 (new BrowserFrame(view))->InitBrowserFrame(); |
665 return view; | 665 return view; |
666 } | 666 } |
OLD | NEW |