Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(232)

Side by Side Diff: chrome/browser/chromeos/frame/browser_view.cc

Issue 5854003: Remove CrOS hack from ppapi.gyp that made the include directories work. This... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 10 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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_command_ids.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/gtk/gtk_util.h" 21 #include "chrome/browser/gtk/gtk_util.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"
31 #include "gfx/canvas.h" 30 #include "gfx/canvas.h"
32 #include "grit/generated_resources.h" 31 #include "grit/generated_resources.h"
32 #include "third_party/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 346 matching lines...) Expand 10 before | Expand all | Expand 10 after
389 BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser) { 389 BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser) {
390 // Create a browser view for chromeos. 390 // Create a browser view for chromeos.
391 BrowserView* view; 391 BrowserView* view;
392 if (browser->type() & Browser::TYPE_POPUP) 392 if (browser->type() & Browser::TYPE_POPUP)
393 view = new chromeos::PanelBrowserView(browser); 393 view = new chromeos::PanelBrowserView(browser);
394 else 394 else
395 view = new chromeos::BrowserView(browser); 395 view = new chromeos::BrowserView(browser);
396 BrowserFrame::Create(view, browser->profile()); 396 BrowserFrame::Create(view, browser->profile());
397 return view; 397 return view;
398 } 398 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698