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_command_ids.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/input_method_menu_button.h" | 15 #include "chrome/browser/chromeos/status/input_method_menu_button.h" |
16 #include "chrome/browser/chromeos/status/network_menu_button.h" | 16 #include "chrome/browser/chromeos/status/network_menu_button.h" |
17 #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" | 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/frame/browser_frame_gtk.h" | 21 #include "chrome/browser/views/frame/browser_frame_gtk.h" |
22 #include "chrome/browser/views/frame/browser_view.h" | 22 #include "chrome/browser/views/frame/browser_view.h" |
23 #include "chrome/browser/views/frame/browser_view_layout.h" | 23 #include "chrome/browser/views/frame/browser_view_layout.h" |
(...skipping 341 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
365 BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser) { | 365 BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser) { |
366 // Create a browser view for chromeos. | 366 // Create a browser view for chromeos. |
367 BrowserView* view; | 367 BrowserView* view; |
368 if (browser->type() & Browser::TYPE_POPUP) | 368 if (browser->type() & Browser::TYPE_POPUP) |
369 view = new chromeos::PanelBrowserView(browser); | 369 view = new chromeos::PanelBrowserView(browser); |
370 else | 370 else |
371 view = new chromeos::BrowserView(browser); | 371 view = new chromeos::BrowserView(browser); |
372 BrowserFrame::Create(view, browser->profile()); | 372 BrowserFrame::Create(view, browser->profile()); |
373 return view; | 373 return view; |
374 } | 374 } |
OLD | NEW |