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

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

Issue 6692001: Add in DOMBrowserView and Frame related classes (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Created 9 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_frame_chromeos.h" 5 #include "chrome/browser/chromeos/frame/browser_frame_chromeos.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "chrome/browser/ui/views/frame/browser_view.h" 8 #include "chrome/browser/ui/views/frame/browser_view.h"
9 #include "chrome/browser/ui/views/frame/browser_non_client_frame_view.h" 9 #include "chrome/browser/ui/views/frame/browser_non_client_frame_view.h"
10 #include "chrome/common/chrome_switches.h" 10 #include "chrome/common/chrome_switches.h"
(...skipping 13 matching lines...) Expand all
24 BrowserView* browser_view, Profile* profile) 24 BrowserView* browser_view, Profile* profile)
25 : BrowserFrameGtk(browser_view, profile) { 25 : BrowserFrameGtk(browser_view, profile) {
26 } 26 }
27 27
28 BrowserFrameChromeos::~BrowserFrameChromeos() { 28 BrowserFrameChromeos::~BrowserFrameChromeos() {
29 } 29 }
30 30
31 void BrowserFrameChromeos::InitBrowserFrame() { 31 void BrowserFrameChromeos::InitBrowserFrame() {
32 // NOTE: This logic supersedes the logic in BrowserFrameGtk::Init() 32 // NOTE: This logic supersedes the logic in BrowserFrameGtk::Init()
33 // by always setting browser_frame_view_. 33 // by always setting browser_frame_view_.
34 set_browser_frame_view( 34 set_browser_frame_view(CreateBrowserNonClientFrameView());
35 browser::CreateBrowserNonClientFrameView(this, browser_view()));
36 35
37 BrowserFrameGtk::InitBrowserFrame(); 36 BrowserFrameGtk::InitBrowserFrame();
38 37
39 if (!browser_view()->IsBrowserTypePopup()) { 38 if (!browser_view()->IsBrowserTypePopup()) {
40 // On chromeos we want windows to always render as active. 39 // On chromeos we want windows to always render as active.
41 DisableInactiveRendering(); 40 DisableInactiveRendering();
42 } 41 }
43 } 42 }
44 43
45 bool BrowserFrameChromeos::IsMaximized() const { 44 bool BrowserFrameChromeos::IsMaximized() const {
46 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kChromeosFrame)) 45 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kChromeosFrame))
47 return WindowGtk::IsMaximized(); 46 return WindowGtk::IsMaximized();
48 bool is_popup = browser_view()->IsBrowserTypePopup(); 47 bool is_popup = browser_view()->IsBrowserTypePopup();
49 return !IsFullscreen() && (!is_popup || WindowGtk::IsMaximized()); 48 return !IsFullscreen() && (!is_popup || WindowGtk::IsMaximized());
50 } 49 }
51 50
51 BrowserNonClientFrameView*
52 BrowserFrameChromeos::CreateBrowserNonClientFrameView() {
53 return browser::CreateBrowserNonClientFrameView(this, browser_view());
54 }
55
52 } // namespace chromeos 56 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698