OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/ui/views/extensions/shell_window_views.h" | 5 #include "chrome/browser/ui/views/extensions/shell_window_views.h" |
6 | 6 |
7 #include "base/utf_string_conversions.h" | 7 #include "base/utf_string_conversions.h" |
8 #include "chrome/browser/extensions/extension_host.h" | 8 #include "chrome/browser/extensions/extension_host.h" |
9 #include "chrome/common/extensions/draggable_region.h" | 9 #include "chrome/common/extensions/draggable_region.h" |
10 #include "chrome/common/extensions/extension.h" | 10 #include "chrome/common/extensions/extension.h" |
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
89 views::ImageButton* close_button_; | 89 views::ImageButton* close_button_; |
90 | 90 |
91 DISALLOW_COPY_AND_ASSIGN(ShellWindowFrameView); | 91 DISALLOW_COPY_AND_ASSIGN(ShellWindowFrameView); |
92 }; | 92 }; |
93 | 93 |
94 const char ShellWindowFrameView::kViewClassName[] = | 94 const char ShellWindowFrameView::kViewClassName[] = |
95 "browser/ui/views/extensions/ShellWindowFrameView"; | 95 "browser/ui/views/extensions/ShellWindowFrameView"; |
96 | 96 |
97 ShellWindowFrameView::ShellWindowFrameView(ShellWindowViews* window) | 97 ShellWindowFrameView::ShellWindowFrameView(ShellWindowViews* window) |
98 : window_(window), | 98 : window_(window), |
| 99 frame_(NULL), |
99 close_button_(NULL) { | 100 close_button_(NULL) { |
100 } | 101 } |
101 | 102 |
102 ShellWindowFrameView::~ShellWindowFrameView() { | 103 ShellWindowFrameView::~ShellWindowFrameView() { |
103 } | 104 } |
104 | 105 |
105 void ShellWindowFrameView::Init(views::Widget* frame) { | 106 void ShellWindowFrameView::Init(views::Widget* frame) { |
106 frame_ = frame; | 107 frame_ = frame; |
107 | 108 |
108 if (!window_->frameless()) { | 109 if (!window_->frameless()) { |
(...skipping 470 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
579 OnViewWasResized(); | 580 OnViewWasResized(); |
580 } | 581 } |
581 | 582 |
582 // static | 583 // static |
583 ShellWindow* ShellWindow::CreateImpl(Profile* profile, | 584 ShellWindow* ShellWindow::CreateImpl(Profile* profile, |
584 const extensions::Extension* extension, | 585 const extensions::Extension* extension, |
585 const GURL& url, | 586 const GURL& url, |
586 const ShellWindow::CreateParams& params) { | 587 const ShellWindow::CreateParams& params) { |
587 return new ShellWindowViews(profile, extension, url, params); | 588 return new ShellWindowViews(profile, extension, url, params); |
588 } | 589 } |
OLD | NEW |