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

Unified Diff: chrome/browser/sidebar/sidebar_container.cc

Issue 6378009: Only allow extension pages to be displayed in the sidebar to be consistent... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 11 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
« no previous file with comments | « chrome/browser/sidebar/sidebar_container.h ('k') | chrome/common/extensions/api/extension_api.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sidebar/sidebar_container.cc
===================================================================
--- chrome/browser/sidebar/sidebar_container.cc (revision 72219)
+++ chrome/browser/sidebar/sidebar_container.cc (working copy)
@@ -26,7 +26,7 @@
content_id_(content_id),
delegate_(delegate),
icon_(new SkBitmap),
- navigate_to_default_url_on_expand_(true),
+ navigate_to_default_page_on_expand_(true),
use_default_icon_(true) {
// Create TabContents for sidebar.
sidebar_contents_.reset(
@@ -69,13 +69,13 @@
}
void SidebarContainer::Expand() {
- if (navigate_to_default_url_on_expand_) {
- navigate_to_default_url_on_expand_ = false;
- // Check whether a default URL is specified for this sidebar.
+ if (navigate_to_default_page_on_expand_) {
+ navigate_to_default_page_on_expand_ = false;
+ // Check whether a default page is specified for this sidebar.
const Extension* extension = GetExtension();
if (extension) { // Can be NULL in tests.
- if (extension->sidebar_defaults()->default_url().is_valid())
- Navigate(extension->sidebar_defaults()->default_url());
+ if (extension->sidebar_defaults()->default_page().is_valid())
+ Navigate(extension->sidebar_defaults()->default_page());
}
}
@@ -89,7 +89,7 @@
void SidebarContainer::Navigate(const GURL& url) {
// TODO(alekseys): add a progress UI.
- navigate_to_default_url_on_expand_ = false;
+ navigate_to_default_page_on_expand_ = false;
sidebar_contents_->controller().LoadURL(
url, GURL(), PageTransition::START_PAGE);
}
« no previous file with comments | « chrome/browser/sidebar/sidebar_container.h ('k') | chrome/common/extensions/api/extension_api.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698