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

Side by Side Diff: chrome/browser/ui/panels/panel_browser_frame_view.cc

Issue 9147052: fix panel window string resource ID (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: better string desc Created 8 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/browser/ui/gtk/browser_titlebar.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/panels/panel_browser_frame_view.h" 5 #include "chrome/browser/ui/panels/panel_browser_frame_view.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/utf_string_conversions.h" 9 #include "base/utf_string_conversions.h"
10 #include "chrome/browser/themes/theme_service.h" 10 #include "chrome/browser/themes/theme_service.h"
(...skipping 324 matching lines...) Expand 10 before | Expand all | Expand 10 after
335 335
336 const ButtonResources& settings_button_resources = 336 const ButtonResources& settings_button_resources =
337 GetSettingsButtonResources(); 337 GetSettingsButtonResources();
338 settings_button_ = new views::MenuButton(NULL, string16(), this, false); 338 settings_button_ = new views::MenuButton(NULL, string16(), this, false);
339 settings_button_->SetIcon(*(settings_button_resources.normal_image)); 339 settings_button_->SetIcon(*(settings_button_resources.normal_image));
340 settings_button_->SetHoverIcon(*(settings_button_resources.hover_image)); 340 settings_button_->SetHoverIcon(*(settings_button_resources.hover_image));
341 settings_button_->SetPushedIcon(*(settings_button_resources.pushed_image)); 341 settings_button_->SetPushedIcon(*(settings_button_resources.pushed_image));
342 settings_button_->set_alignment(views::TextButton::ALIGN_CENTER); 342 settings_button_->set_alignment(views::TextButton::ALIGN_CENTER);
343 settings_button_->set_border(NULL); 343 settings_button_->set_border(NULL);
344 settings_button_->SetTooltipText( 344 settings_button_->SetTooltipText(
345 l10n_util::GetStringUTF16(IDS_NEW_TAB_APP_SETTINGS)); 345 l10n_util::GetStringUTF16(IDS_PANEL_WINDOW_SETTINGS_BUTTON_TOOLTIP));
346 settings_button_->SetAccessibleName( 346 settings_button_->SetAccessibleName(
347 l10n_util::GetStringUTF16(IDS_NEW_TAB_APP_SETTINGS)); 347 l10n_util::GetStringUTF16(IDS_PANEL_WINDOW_SETTINGS_BUTTON_TOOLTIP));
348 settings_button_->SetVisible(is_settings_button_visible_); 348 settings_button_->SetVisible(is_settings_button_visible_);
349 AddChildView(settings_button_); 349 AddChildView(settings_button_);
350 350
351 const ButtonResources& close_button_resources = GetCloseButtonResources(); 351 const ButtonResources& close_button_resources = GetCloseButtonResources();
352 close_button_ = new views::ImageButton(this); 352 close_button_ = new views::ImageButton(this);
353 close_button_->SetImage(views::CustomButton::BS_NORMAL, 353 close_button_->SetImage(views::CustomButton::BS_NORMAL,
354 close_button_resources.normal_image); 354 close_button_resources.normal_image);
355 close_button_->SetImage(views::CustomButton::BS_HOT, 355 close_button_->SetImage(views::CustomButton::BS_HOT,
356 close_button_resources.hover_image); 356 close_button_resources.hover_image);
357 close_button_->SetImage(views::CustomButton::BS_PUSHED, 357 close_button_->SetImage(views::CustomButton::BS_PUSHED,
(...skipping 522 matching lines...) Expand 10 before | Expand all | Expand 10 after
880 880
881 settings_menu_model_.reset( 881 settings_menu_model_.reset(
882 new PanelSettingsMenuModel(panel_browser_view_->panel())); 882 new PanelSettingsMenuModel(panel_browser_view_->panel()));
883 settings_menu_adapter_.reset( 883 settings_menu_adapter_.reset(
884 new views::MenuModelAdapter(settings_menu_model_.get())); 884 new views::MenuModelAdapter(settings_menu_model_.get()));
885 settings_menu_ = new views::MenuItemView(settings_menu_adapter_.get()); 885 settings_menu_ = new views::MenuItemView(settings_menu_adapter_.get());
886 settings_menu_adapter_->BuildMenu(settings_menu_); 886 settings_menu_adapter_->BuildMenu(settings_menu_);
887 settings_menu_runner_.reset(new views::MenuRunner(settings_menu_)); 887 settings_menu_runner_.reset(new views::MenuRunner(settings_menu_));
888 return true; 888 return true;
889 } 889 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/gtk/browser_titlebar.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698