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

Side by Side Diff: chrome/browser/ui/views/desktop_capture/desktop_media_picker_views.cc

Issue 2187473003: Remove #includes of "xxx_google_chrome_strings.h". (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix bad merge Created 4 years, 4 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/desktop_capture/desktop_media_picker_views.h" 5 #include "chrome/browser/ui/views/desktop_capture/desktop_media_picker_views.h"
6 6
7 #include "base/callback.h" 7 #include "base/callback.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "chrome/browser/media/desktop_media_list.h" 9 #include "chrome/browser/media/desktop_media_list.h"
10 #include "chrome/browser/ui/browser_finder.h" 10 #include "chrome/browser/ui/browser_finder.h"
11 #include "chrome/browser/ui/browser_window.h" 11 #include "chrome/browser/ui/browser_window.h"
12 #include "chrome/browser/ui/views/desktop_capture/desktop_media_list_view.h" 12 #include "chrome/browser/ui/views/desktop_capture/desktop_media_list_view.h"
13 #include "chrome/browser/ui/views/desktop_capture/desktop_media_source_view.h" 13 #include "chrome/browser/ui/views/desktop_capture/desktop_media_source_view.h"
14 #include "chrome/browser/ui/views/desktop_media_picker_views_deprecated.h" 14 #include "chrome/browser/ui/views/desktop_media_picker_views_deprecated.h"
15 #include "chrome/grit/chromium_strings.h" 15 #include "chrome/grit/chromium_strings.h"
16 #include "chrome/grit/generated_resources.h" 16 #include "chrome/grit/generated_resources.h"
17 #include "chrome/grit/google_chrome_strings.h"
18 #include "components/constrained_window/constrained_window_views.h" 17 #include "components/constrained_window/constrained_window_views.h"
19 #include "components/web_modal/web_contents_modal_dialog_manager.h" 18 #include "components/web_modal/web_contents_modal_dialog_manager.h"
20 #include "content/public/browser/browser_thread.h" 19 #include "content/public/browser/browser_thread.h"
21 #include "content/public/browser/render_frame_host.h" 20 #include "content/public/browser/render_frame_host.h"
22 #include "content/public/browser/web_contents_delegate.h" 21 #include "content/public/browser/web_contents_delegate.h"
23 #include "extensions/common/switches.h" 22 #include "extensions/common/switches.h"
24 #include "grit/components_strings.h" 23 #include "grit/components_strings.h"
25 #include "ui/aura/window_tree_host.h" 24 #include "ui/aura/window_tree_host.h"
26 #include "ui/base/l10n/l10n_util.h" 25 #include "ui/base/l10n/l10n_util.h"
27 #include "ui/events/keycodes/keyboard_codes.h" 26 #include "ui/events/keycodes/keyboard_codes.h"
(...skipping 410 matching lines...) Expand 10 before | Expand all | Expand 10 after
438 437
439 // static 438 // static
440 std::unique_ptr<DesktopMediaPicker> DesktopMediaPicker::Create() { 439 std::unique_ptr<DesktopMediaPicker> DesktopMediaPicker::Create() {
441 if (base::CommandLine::ForCurrentProcess()->HasSwitch( 440 if (base::CommandLine::ForCurrentProcess()->HasSwitch(
442 extensions::switches::kDisableDesktopCapturePickerNewUI)) { 441 extensions::switches::kDisableDesktopCapturePickerNewUI)) {
443 return std::unique_ptr<DesktopMediaPicker>( 442 return std::unique_ptr<DesktopMediaPicker>(
444 new deprecated::DesktopMediaPickerViews()); 443 new deprecated::DesktopMediaPickerViews());
445 } 444 }
446 return std::unique_ptr<DesktopMediaPicker>(new DesktopMediaPickerViews()); 445 return std::unique_ptr<DesktopMediaPicker>(new DesktopMediaPickerViews());
447 } 446 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/startup/session_crashed_infobar_delegate.cc ('k') | chrome/browser/ui/views/session_crashed_bubble_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698