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

Side by Side Diff: third_party/WebKit/Source/core/frame/BarProp.cpp

Issue 2905283003: Remove a bunch of dead code around WindowFeatures (Closed)
Patch Set: Use WebWindowFeatures everywhere Created 3 years, 6 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 /* 1 /*
2 * Copyright (C) 2007, 2010 Apple Inc. All rights reserved. 2 * Copyright (C) 2007, 2010 Apple Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 11 matching lines...) Expand all
22 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 22 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
23 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 23 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
24 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 24 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
25 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 25 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
26 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 26 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
27 */ 27 */
28 28
29 #include "core/frame/BarProp.h" 29 #include "core/frame/BarProp.h"
30 30
31 #include "core/frame/LocalFrame.h" 31 #include "core/frame/LocalFrame.h"
32 #include "core/page/ChromeClient.h"
33 #include "core/page/Page.h" 32 #include "core/page/Page.h"
33 #include "public/web/WebWindowFeatures.h"
34 34
35 namespace blink { 35 namespace blink {
36 36
37 BarProp::BarProp(LocalFrame* frame, Type type) 37 BarProp::BarProp(LocalFrame* frame, Type type)
38 : DOMWindowClient(frame), type_(type) {} 38 : DOMWindowClient(frame), type_(type) {}
39 39
40 DEFINE_TRACE(BarProp) { 40 DEFINE_TRACE(BarProp) {
41 DOMWindowClient::Trace(visitor); 41 DOMWindowClient::Trace(visitor);
42 } 42 }
43 43
44 bool BarProp::visible() const { 44 bool BarProp::visible() const {
45 if (!GetFrame()) 45 if (!GetFrame())
46 return false; 46 return false;
47 DCHECK(GetFrame()->GetPage()); 47 DCHECK(GetFrame()->GetPage());
48 48
49 const WebWindowFeatures& features =
50 GetFrame()->GetPage()->GetWindowFeatures();
49 switch (type_) { 51 switch (type_) {
50 case kLocationbar: 52 case kLocationbar:
51 case kPersonalbar: 53 case kPersonalbar:
52 case kToolbar: 54 case kToolbar:
53 return GetFrame()->GetPage()->GetChromeClient().ToolbarsVisible(); 55 return features.tool_bar_visible;
54 case kMenubar: 56 case kMenubar:
55 return GetFrame()->GetPage()->GetChromeClient().MenubarVisible(); 57 return features.menu_bar_visible;
56 case kScrollbars: 58 case kScrollbars:
57 return GetFrame()->GetPage()->GetChromeClient().ScrollbarsVisible(); 59 return features.scrollbars_visible;
58 case kStatusbar: 60 case kStatusbar:
59 return GetFrame()->GetPage()->GetChromeClient().StatusbarVisible(); 61 return features.status_bar_visible;
60 } 62 }
61 63
62 NOTREACHED(); 64 NOTREACHED();
63 return false; 65 return false;
64 } 66 }
65 67
66 } // namespace blink 68 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698