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/toolbar/toolbar_action_view.cc

Issue 1573843002: Make `chrome` target build without unused data members on Linux. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@content_target
Patch Set: Created 4 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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/toolbar/toolbar_action_view.h" 5 #include "chrome/browser/ui/views/toolbar/toolbar_action_view.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/auto_reset.h" 9 #include "base/auto_reset.h"
10 #include "chrome/browser/chrome_notification_types.h" 10 #include "chrome/browser/chrome_notification_types.h"
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 // The callback to call directly before showing the context menu. 49 // The callback to call directly before showing the context menu.
50 ToolbarActionView::ContextMenuCallback* context_menu_callback = nullptr; 50 ToolbarActionView::ContextMenuCallback* context_menu_callback = nullptr;
51 51
52 } // namespace 52 } // namespace
53 53
54 //////////////////////////////////////////////////////////////////////////////// 54 ////////////////////////////////////////////////////////////////////////////////
55 // ToolbarActionView 55 // ToolbarActionView
56 56
57 ToolbarActionView::ToolbarActionView( 57 ToolbarActionView::ToolbarActionView(
58 ToolbarActionViewController* view_controller, 58 ToolbarActionViewController* view_controller,
59 Profile* profile, 59 Profile* profile,
jam 2016/01/13 16:18:52 no need to pass
mlamouri (slow - plz ping) 2016/01/15 09:55:14 Done.
60 ToolbarActionView::Delegate* delegate) 60 ToolbarActionView::Delegate* delegate)
61 : MenuButton(nullptr, base::string16(), this, false), 61 : MenuButton(nullptr, base::string16(), this, false),
62 view_controller_(view_controller), 62 view_controller_(view_controller),
63 profile_(profile),
64 delegate_(delegate), 63 delegate_(delegate),
65 called_register_command_(false), 64 called_register_command_(false),
66 wants_to_run_(false), 65 wants_to_run_(false),
67 menu_(nullptr), 66 menu_(nullptr),
68 ink_drop_delegate_(new views::ButtonInkDropDelegate(this, this)), 67 ink_drop_delegate_(new views::ButtonInkDropDelegate(this, this)),
69 weak_factory_(this) { 68 weak_factory_(this) {
70 set_ink_drop_delegate(ink_drop_delegate_.get()); 69 set_ink_drop_delegate(ink_drop_delegate_.get());
71 set_has_ink_drop_action_on_click(true); 70 set_has_ink_drop_action_on_click(true);
72 set_id(VIEW_ID_BROWSER_ACTION); 71 set_id(VIEW_ID_BROWSER_ACTION);
73 view_controller_->SetDelegate(this); 72 view_controller_->SetDelegate(this);
(...skipping 297 matching lines...) Expand 10 before | Expand all | Expand 10 after
371 if (menu_controller->in_nested_run()) { 370 if (menu_controller->in_nested_run()) {
372 // There is another menu showing. Close the outermost menu (since we are 371 // There is another menu showing. Close the outermost menu (since we are
373 // shown in the same menu, we don't want to close the whole thing). 372 // shown in the same menu, we don't want to close the whole thing).
374 menu_controller->Cancel(views::MenuController::EXIT_OUTERMOST); 373 menu_controller->Cancel(views::MenuController::EXIT_OUTERMOST);
375 return true; 374 return true;
376 } 375 }
377 } 376 }
378 377
379 return false; 378 return false;
380 } 379 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/toolbar/toolbar_action_view.h ('k') | components/gcm_driver/instance_id/instance_id_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698