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

Side by Side Diff: chrome/browser/views/toolbar_view.cc

Issue 259004: First cut at badge implementation. Right now it just uses static (Closed)
Patch Set: cleanup Created 11 years, 2 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
OLDNEW
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 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/views/toolbar_view.h" 5 #include "chrome/browser/views/toolbar_view.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "app/drag_drop_types.h" 9 #include "app/drag_drop_types.h"
10 #include "app/gfx/canvas.h" 10 #include "app/gfx/canvas.h"
(...skipping 521 matching lines...) Expand 10 before | Expand all | Expand 10 after
532 532
533 int next_menu_x = go_->x() + go_->width() + kMenuButtonOffset; 533 int next_menu_x = go_->x() + go_->width() + kMenuButtonOffset;
534 534
535 if (bookmark_menu_) { 535 if (bookmark_menu_) {
536 bookmark_menu_->SetBounds(next_menu_x, child_y, bookmark_menu_width, 536 bookmark_menu_->SetBounds(next_menu_x, child_y, bookmark_menu_width,
537 child_height); 537 child_height);
538 next_menu_x += bookmark_menu_width; 538 next_menu_x += bookmark_menu_width;
539 } 539 }
540 540
541 browser_actions_->SetBounds( 541 browser_actions_->SetBounds(
542 next_menu_x, child_y, browser_actions_width, child_height); 542 next_menu_x, 0, browser_actions_width, height());
543 next_menu_x += browser_actions_width; 543 next_menu_x += browser_actions_width;
544 544
545 page_menu_->SetBounds(next_menu_x, child_y, page_menu_width, child_height); 545 page_menu_->SetBounds(next_menu_x, child_y, page_menu_width, child_height);
546 next_menu_x += page_menu_width; 546 next_menu_x += page_menu_width;
547 547
548 app_menu_->SetBounds(next_menu_x, child_y, app_menu_width, child_height); 548 app_menu_->SetBounds(next_menu_x, child_y, app_menu_width, child_height);
549 } 549 }
550 550
551 void ToolbarView::Paint(gfx::Canvas* canvas) { 551 void ToolbarView::Paint(gfx::Canvas* canvas) {
552 View::Paint(canvas); 552 View::Paint(canvas);
(...skipping 575 matching lines...) Expand 10 before | Expand all | Expand 10 after
1128 app_menu_contents_->AddItem(IDC_ABOUT, 1128 app_menu_contents_->AddItem(IDC_ABOUT,
1129 l10n_util::GetStringFUTF16( 1129 l10n_util::GetStringFUTF16(
1130 IDS_ABOUT, 1130 IDS_ABOUT,
1131 l10n_util::GetStringUTF16(IDS_PRODUCT_NAME))); 1131 l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)));
1132 app_menu_contents_->AddItemWithStringId(IDC_HELP_PAGE, IDS_HELP_PAGE); 1132 app_menu_contents_->AddItemWithStringId(IDC_HELP_PAGE, IDS_HELP_PAGE);
1133 app_menu_contents_->AddSeparator(); 1133 app_menu_contents_->AddSeparator();
1134 app_menu_contents_->AddItemWithStringId(IDC_EXIT, IDS_EXIT); 1134 app_menu_contents_->AddItemWithStringId(IDC_EXIT, IDS_EXIT);
1135 1135
1136 app_menu_menu_.reset(new views::Menu2(app_menu_contents_.get())); 1136 app_menu_menu_.reset(new views::Menu2(app_menu_contents_.get()));
1137 } 1137 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698