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

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

Issue 3056003: Attemp 2 at: (Closed)
Patch Set: Fix chromeos breakage Created 10 years, 5 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
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
(...skipping 15 matching lines...) Expand all
26 #include "chrome/browser/views/tabs/tab.h" 26 #include "chrome/browser/views/tabs/tab.h"
27 #include "chrome/browser/views/tabs/tab_strip.h" 27 #include "chrome/browser/views/tabs/tab_strip.h"
28 #include "chrome/browser/views/theme_background.h" 28 #include "chrome/browser/views/theme_background.h"
29 #include "chrome/browser/views/toolbar_view.h" 29 #include "chrome/browser/views/toolbar_view.h"
30 #include "chrome/common/chrome_switches.h" 30 #include "chrome/common/chrome_switches.h"
31 #include "gfx/canvas.h" 31 #include "gfx/canvas.h"
32 #include "grit/generated_resources.h" 32 #include "grit/generated_resources.h"
33 #include "third_party/cros/chromeos_wm_ipc_enums.h" 33 #include "third_party/cros/chromeos_wm_ipc_enums.h"
34 #include "views/controls/button/button.h" 34 #include "views/controls/button/button.h"
35 #include "views/controls/button/image_button.h" 35 #include "views/controls/button/image_button.h"
36 #include "views/controls/image_view.h"
36 #include "views/controls/menu/menu_2.h" 37 #include "views/controls/menu/menu_2.h"
37 #include "views/screen.h" 38 #include "views/screen.h"
38 #include "views/widget/root_view.h" 39 #include "views/widget/root_view.h"
39 #include "views/window/hit_test.h" 40 #include "views/window/hit_test.h"
40 #include "views/window/window.h" 41 #include "views/window/window.h"
41 42
42 namespace { 43 namespace {
43 44
44 // The OTR avatar ends 2 px above the bottom of the tabstrip (which, given the 45 // The OTR avatar ends 2 px above the bottom of the tabstrip (which, given the
45 // way the tabstrip draws its bottom edge, will appear like a 1 px gap to the 46 // way the tabstrip draws its bottom edge, will appear like a 1 px gap to the
(...skipping 398 matching lines...) Expand 10 before | Expand all | Expand 10 after
444 BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser) { 445 BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser) {
445 // Create a browser view for chromeos. 446 // Create a browser view for chromeos.
446 BrowserView* view; 447 BrowserView* view;
447 if (browser->type() & Browser::TYPE_POPUP) 448 if (browser->type() & Browser::TYPE_POPUP)
448 view = new chromeos::PanelBrowserView(browser); 449 view = new chromeos::PanelBrowserView(browser);
449 else 450 else
450 view = new chromeos::BrowserView(browser); 451 view = new chromeos::BrowserView(browser);
451 BrowserFrame::Create(view, browser->profile()); 452 BrowserFrame::Create(view, browser->profile());
452 return view; 453 return view;
453 } 454 }
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/frame/browser_view.h ('k') | chrome/browser/cocoa/browser_window_cocoa.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698