diff options
| -rw-r--r-- | chrome/browser/views/bookmark_bar_instructions_view.cc | 5 | ||||
| -rw-r--r-- | chrome/browser/views/bookmark_bar_view.cc | 7 | ||||
| -rwxr-xr-x | chrome/chrome.gyp | 2 |
3 files changed, 10 insertions, 4 deletions
diff --git a/chrome/browser/views/bookmark_bar_instructions_view.cc b/chrome/browser/views/bookmark_bar_instructions_view.cc index 3b38001..b8d644f 100644 --- a/chrome/browser/views/bookmark_bar_instructions_view.cc +++ b/chrome/browser/views/bookmark_bar_instructions_view.cc @@ -22,8 +22,6 @@ BookmarkBarInstructionsView::BookmarkBarInstructionsView(Delegate* delegate) import_link_(NULL), baseline_(-1), updated_colors_(false) { - ResourceBundle& rb = ResourceBundle::GetSharedInstance(); - instructions_ = new views::Label( l10n_util::GetString(IDS_BOOKMARKS_NO_ITEMS)); AddChildView(instructions_); @@ -102,5 +100,6 @@ void BookmarkBarInstructionsView::UpdateColors() { SkColor text_color = theme_provider->GetColor(BrowserThemeProvider::COLOR_BOOKMARK_TEXT); instructions_->SetColor(text_color); - import_link_->SetColor(text_color); + if (import_link_) + import_link_->SetColor(text_color); } diff --git a/chrome/browser/views/bookmark_bar_view.cc b/chrome/browser/views/bookmark_bar_view.cc index 6f57092d..9bd479c 100644 --- a/chrome/browser/views/bookmark_bar_view.cc +++ b/chrome/browser/views/bookmark_bar_view.cc @@ -29,7 +29,6 @@ #include "chrome/browser/views/bookmark_context_menu.h" #include "chrome/browser/views/event_utils.h" #include "chrome/browser/views/frame/browser_view.h" -#include "chrome/browser/views/importer_view.h" #include "chrome/browser/views/location_bar_view.h" #include "chrome/common/notification_service.h" #include "chrome/common/page_transition_types.h" @@ -48,6 +47,10 @@ #include "views/widget/widget.h" #include "views/window/window.h" +#if defined(OS_WIN) +#include "chrome/browser/views/importer_view.h" +#endif + using views::CustomButton; using views::DropTargetEvent; using views::MenuButton; @@ -862,10 +865,12 @@ void BookmarkBarView::GetAnchorPositionAndStartIndexForButton( } void BookmarkBarView::ShowImportDialog() { +#if defined(OS_WIN) views::Window::CreateChromeWindow( GetWindow()->GetNativeWindow(), gfx::Rect(), new ImporterView(profile_, FAVORITES))->Show(); +#endif } void BookmarkBarView::Init() { diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index 9b44c7d..fc13207 100755 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -2812,6 +2812,8 @@ ['include', '^browser/views/autocomplete/autocomplete_popup_gtk.h'], ['include', '^browser/views/blocked_popup_container_view_views.cc'], ['include', '^browser/views/blocked_popup_container_view_views.h'], + ['include', '^browser/views/bookmark_bar_instructions_view.cc'], + ['include', '^browser/views/bookmark_bar_instructions_view.h'], ['include', '^browser/views/bookmark_bar_view.cc'], ['include', '^browser/views/bookmark_bar_view.h'], ['include', '^browser/views/bookmark_bubble_view.cc'], |