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

Side by Side Diff: chrome/browser/ui/views/wrench_menu.cc

Issue 10382144: Change SetImage, SetBackground, and SetToggledImage to take in a gfx::ImageSkia (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased Created 8 years, 7 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
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/views/wrench_menu.h" 5 #include "chrome/browser/ui/views/wrench_menu.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <cmath> 8 #include <cmath>
9 #include <set> 9 #include <set>
10 10
(...skipping 408 matching lines...) Expand 10 before | Expand all | Expand 10 after
419 419
420 increment_button_ = CreateButtonWithAccName( 420 increment_button_ = CreateButtonWithAccName(
421 IDS_ZOOM_PLUS2, MenuButtonBackground::RIGHT_BUTTON, increment_index, 421 IDS_ZOOM_PLUS2, MenuButtonBackground::RIGHT_BUTTON, increment_index,
422 NULL, IDS_ACCNAME_ZOOM_PLUS2); 422 NULL, IDS_ACCNAME_ZOOM_PLUS2);
423 423
424 center_bg->SetOtherButtons(decrement_button_, increment_button_); 424 center_bg->SetOtherButtons(decrement_button_, increment_button_);
425 425
426 fullscreen_button_ = new FullscreenButton(this); 426 fullscreen_button_ = new FullscreenButton(this);
427 fullscreen_button_->SetImage( 427 fullscreen_button_->SetImage(
428 ImageButton::BS_NORMAL, 428 ImageButton::BS_NORMAL,
429 ui::ResourceBundle::GetSharedInstance().GetBitmapNamed( 429 ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
430 IDR_FULLSCREEN_MENU_BUTTON)); 430 IDR_FULLSCREEN_MENU_BUTTON));
431 fullscreen_button_->set_focusable(true); 431 fullscreen_button_->set_focusable(true);
432 fullscreen_button_->set_request_focus_on_press(false); 432 fullscreen_button_->set_request_focus_on_press(false);
433 fullscreen_button_->set_tag(fullscreen_index); 433 fullscreen_button_->set_tag(fullscreen_index);
434 fullscreen_button_->SetImageAlignment( 434 fullscreen_button_->SetImageAlignment(
435 ImageButton::ALIGN_CENTER, ImageButton::ALIGN_MIDDLE); 435 ImageButton::ALIGN_CENTER, ImageButton::ALIGN_MIDDLE);
436 fullscreen_button_->set_border(views::Border::CreateEmptyBorder( 436 fullscreen_button_->set_border(views::Border::CreateEmptyBorder(
437 0, kHorizontalPadding, 0, kHorizontalPadding)); 437 0, kHorizontalPadding, 0, kHorizontalPadding));
438 fullscreen_button_->set_background( 438 fullscreen_button_->set_background(
439 new MenuButtonBackground(MenuButtonBackground::SINGLE_BUTTON)); 439 new MenuButtonBackground(MenuButtonBackground::SINGLE_BUTTON));
(...skipping 474 matching lines...) Expand 10 before | Expand all | Expand 10 after
914 bookmark_menu_delegate_.reset( 914 bookmark_menu_delegate_.reset(
915 new BookmarkMenuDelegate(browser_->profile(), 915 new BookmarkMenuDelegate(browser_->profile(),
916 NULL, 916 NULL,
917 parent, 917 parent,
918 first_bookmark_command_id_)); 918 first_bookmark_command_id_));
919 bookmark_menu_delegate_->Init( 919 bookmark_menu_delegate_->Init(
920 this, bookmark_menu_, model->bookmark_bar_node(), 0, 920 this, bookmark_menu_, model->bookmark_bar_node(), 0,
921 BookmarkMenuDelegate::SHOW_PERMANENT_FOLDERS, 921 BookmarkMenuDelegate::SHOW_PERMANENT_FOLDERS,
922 bookmark_utils::LAUNCH_WRENCH_MENU); 922 bookmark_utils::LAUNCH_WRENCH_MENU);
923 } 923 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/web_intent_picker_views.cc ('k') | ui/views/controls/button/image_button.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698