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

Side by Side Diff: content/shell/browser/shell_views.cc

Issue 1874903002: Convert //content from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix indent Created 4 years, 8 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 "content/shell/browser/shell.h" 5 #include "content/shell/browser/shell.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/macros.h" 10 #include "base/macros.h"
(...skipping 353 matching lines...) Expand 10 before | Expand all | Expand 10 after
364 // Window title 364 // Window title
365 base::string16 title_; 365 base::string16 title_;
366 366
367 // Toolbar view contains forward/backward/reload button and URL entry 367 // Toolbar view contains forward/backward/reload button and URL entry
368 View* toolbar_view_; 368 View* toolbar_view_;
369 views::LabelButton* back_button_; 369 views::LabelButton* back_button_;
370 views::LabelButton* forward_button_; 370 views::LabelButton* forward_button_;
371 views::LabelButton* refresh_button_; 371 views::LabelButton* refresh_button_;
372 views::LabelButton* stop_button_; 372 views::LabelButton* stop_button_;
373 views::Textfield* url_entry_; 373 views::Textfield* url_entry_;
374 scoped_ptr<ContextMenuModel> context_menu_model_; 374 std::unique_ptr<ContextMenuModel> context_menu_model_;
375 scoped_ptr<views::MenuRunner> context_menu_runner_; 375 std::unique_ptr<views::MenuRunner> context_menu_runner_;
376 376
377 // Contents view contains the web contents view 377 // Contents view contains the web contents view
378 View* contents_view_; 378 View* contents_view_;
379 views::WebView* web_view_; 379 views::WebView* web_view_;
380 380
381 DISALLOW_COPY_AND_ASSIGN(ShellWindowDelegateView); 381 DISALLOW_COPY_AND_ASSIGN(ShellWindowDelegateView);
382 }; 382 };
383 383
384 } // namespace 384 } // namespace
385 385
(...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after
527 const content::ContextMenuParams& params) { 527 const content::ContextMenuParams& params) {
528 if (headless_) 528 if (headless_)
529 return true; 529 return true;
530 ShellWindowDelegateView* delegate_view = 530 ShellWindowDelegateView* delegate_view =
531 static_cast<ShellWindowDelegateView*>(window_widget_->widget_delegate()); 531 static_cast<ShellWindowDelegateView*>(window_widget_->widget_delegate());
532 delegate_view->ShowWebViewContextMenu(params); 532 delegate_view->ShowWebViewContextMenu(params);
533 return true; 533 return true;
534 } 534 }
535 535
536 } // namespace content 536 } // namespace content
OLDNEW
« no previous file with comments | « content/shell/browser/shell_url_request_context_getter.cc ('k') | content/shell/renderer/layout_test/blink_test_runner.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698