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

Unified Diff: chrome/browser/ui/panels/panel.cc

Issue 10828289: Revert 151353 - Panels refactor: Support browserless panels on Linux. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 4 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/panels/panel.cc
===================================================================
--- chrome/browser/ui/panels/panel.cc (revision 151356)
+++ chrome/browser/ui/panels/panel.cc (working copy)
@@ -102,7 +102,6 @@
Panel::Panel(const std::string& app_name,
const gfx::Size& min_size, const gfx::Size& max_size)
: app_name_(app_name),
- profile_(NULL),
panel_strip_(NULL),
initialized_(false),
min_size_(min_size),
@@ -143,7 +142,6 @@
DCHECK_EQ(EXPANDED, expansion_state_);
DCHECK(!bounds.IsEmpty());
initialized_ = true;
- profile_ = profile;
full_size_ = bounds.size();
native_panel_ = CreateNativePanel(this, bounds);
@@ -217,7 +215,7 @@
}
Profile* Panel::profile() const {
- return profile_;
+ return extension_window_controller_->profile();
}
const std::string Panel::extension_id() const {
« no previous file with comments | « chrome/browser/ui/panels/panel.h ('k') | chrome/browser/ui/panels/panel_and_desktop_notification_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698