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

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

Issue 1132006: Move app/gfx/canvas and app/gfx/font to gfx/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 years, 9 months 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 9
10 #include "app/gfx/canvas.h"
11 #include "app/menus/simple_menu_model.h" 10 #include "app/menus/simple_menu_model.h"
12 #include "app/theme_provider.h" 11 #include "app/theme_provider.h"
13 #include "chrome/app/chrome_dll_resource.h" 12 #include "chrome/app/chrome_dll_resource.h"
14 #include "chrome/browser/chromeos/compact_location_bar_host.h" 13 #include "chrome/browser/chromeos/compact_location_bar_host.h"
15 #include "chrome/browser/chromeos/compact_navigation_bar.h" 14 #include "chrome/browser/chromeos/compact_navigation_bar.h"
16 #include "chrome/browser/chromeos/frame/panel_browser_view.h" 15 #include "chrome/browser/chromeos/frame/panel_browser_view.h"
17 #include "chrome/browser/chromeos/status/browser_status_area_view.h" 16 #include "chrome/browser/chromeos/status/browser_status_area_view.h"
18 #include "chrome/browser/chromeos/status/network_menu_button.h" 17 #include "chrome/browser/chromeos/status/network_menu_button.h"
19 #include "chrome/browser/chromeos/status/status_area_button.h" 18 #include "chrome/browser/chromeos/status/status_area_button.h"
20 #include "chrome/browser/chromeos/wm_ipc.h" 19 #include "chrome/browser/chromeos/wm_ipc.h"
21 #include "chrome/browser/view_ids.h" 20 #include "chrome/browser/view_ids.h"
22 #include "chrome/browser/views/app_launcher.h" 21 #include "chrome/browser/views/app_launcher.h"
23 #include "chrome/browser/views/frame/browser_extender.h" 22 #include "chrome/browser/views/frame/browser_extender.h"
24 #include "chrome/browser/views/frame/browser_frame_gtk.h" 23 #include "chrome/browser/views/frame/browser_frame_gtk.h"
25 #include "chrome/browser/views/frame/browser_view.h" 24 #include "chrome/browser/views/frame/browser_view.h"
26 #include "chrome/browser/views/frame/browser_view_layout.h" 25 #include "chrome/browser/views/frame/browser_view_layout.h"
27 #include "chrome/browser/views/tabs/tab.h" 26 #include "chrome/browser/views/tabs/tab.h"
28 #include "chrome/browser/views/tabs/tab_strip.h" 27 #include "chrome/browser/views/tabs/tab_strip.h"
29 #include "chrome/browser/views/toolbar_view.h" 28 #include "chrome/browser/views/toolbar_view.h"
30 #include "chrome/browser/views/toolbar_star_toggle.h" 29 #include "chrome/browser/views/toolbar_star_toggle.h"
30 #include "gfx/canvas.h"
31 #include "grit/generated_resources.h" 31 #include "grit/generated_resources.h"
32 #include "grit/theme_resources.h" 32 #include "grit/theme_resources.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/window/hit_test.h" 36 #include "views/window/hit_test.h"
37 #include "views/window/window.h" 37 #include "views/window/window.h"
38 38
39 namespace { 39 namespace {
40 40
(...skipping 491 matching lines...) Expand 10 before | Expand all | Expand 10 after
532 BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser) { 532 BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser) {
533 // Create a browser view for chromeos. 533 // Create a browser view for chromeos.
534 BrowserView* view; 534 BrowserView* view;
535 if (browser->type() & Browser::TYPE_POPUP) 535 if (browser->type() & Browser::TYPE_POPUP)
536 view = new chromeos::PanelBrowserView(browser); 536 view = new chromeos::PanelBrowserView(browser);
537 else 537 else
538 view = new chromeos::BrowserView(browser); 538 view = new chromeos::BrowserView(browser);
539 BrowserFrame::Create(view, browser->profile()); 539 BrowserFrame::Create(view, browser->profile());
540 return view; 540 return view;
541 } 541 }
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/compact_navigation_bar.cc ('k') | chrome/browser/chromeos/frame/normal_browser_frame_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698