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

Side by Side Diff: chrome/browser/ui/views/frame/browser_view.cc

Issue 1658793002: Update chrome for new prefs location. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 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 2012 The Chromium Authors. All rights reserved. 1 // Copyright 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/frame/browser_view.h" 5 #include "chrome/browser/ui/views/frame/browser_view.h"
6 6
7 #include <stdint.h> 7 #include <stdint.h>
8 #include <algorithm> 8 #include <algorithm>
9 #include <utility> 9 #include <utility>
10 10
11 #include "base/auto_reset.h" 11 #include "base/auto_reset.h"
12 #include "base/command_line.h" 12 #include "base/command_line.h"
13 #include "base/i18n/rtl.h" 13 #include "base/i18n/rtl.h"
14 #include "base/location.h" 14 #include "base/location.h"
15 #include "base/macros.h" 15 #include "base/macros.h"
16 #include "base/memory/scoped_ptr.h" 16 #include "base/memory/scoped_ptr.h"
17 #include "base/metrics/histogram.h" 17 #include "base/metrics/histogram.h"
18 #include "base/prefs/pref_service.h"
19 #include "base/profiler/scoped_tracker.h" 18 #include "base/profiler/scoped_tracker.h"
20 #include "base/single_thread_task_runner.h" 19 #include "base/single_thread_task_runner.h"
21 #include "base/strings/string_number_conversions.h" 20 #include "base/strings/string_number_conversions.h"
22 #include "base/thread_task_runner_handle.h" 21 #include "base/thread_task_runner_handle.h"
23 #include "build/build_config.h" 22 #include "build/build_config.h"
24 #include "chrome/app/chrome_command_ids.h" 23 #include "chrome/app/chrome_command_ids.h"
25 #include "chrome/app/chrome_dll_resource.h" 24 #include "chrome/app/chrome_dll_resource.h"
26 #include "chrome/browser/app_mode/app_mode_utils.h" 25 #include "chrome/browser/app_mode/app_mode_utils.h"
27 #include "chrome/browser/bookmarks/bookmark_stats.h" 26 #include "chrome/browser/bookmarks/bookmark_stats.h"
28 #include "chrome/browser/browser_process.h" 27 #include "chrome/browser/browser_process.h"
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
103 #include "chrome/common/url_constants.h" 102 #include "chrome/common/url_constants.h"
104 #include "chrome/grit/chromium_strings.h" 103 #include "chrome/grit/chromium_strings.h"
105 #include "chrome/grit/generated_resources.h" 104 #include "chrome/grit/generated_resources.h"
106 #include "chrome/grit/locale_settings.h" 105 #include "chrome/grit/locale_settings.h"
107 #include "components/app_modal/app_modal_dialog.h" 106 #include "components/app_modal/app_modal_dialog.h"
108 #include "components/app_modal/app_modal_dialog_queue.h" 107 #include "components/app_modal/app_modal_dialog_queue.h"
109 #include "components/app_modal/native_app_modal_dialog.h" 108 #include "components/app_modal/native_app_modal_dialog.h"
110 #include "components/omnibox/browser/omnibox_popup_model.h" 109 #include "components/omnibox/browser/omnibox_popup_model.h"
111 #include "components/omnibox/browser/omnibox_popup_view.h" 110 #include "components/omnibox/browser/omnibox_popup_view.h"
112 #include "components/omnibox/browser/omnibox_view.h" 111 #include "components/omnibox/browser/omnibox_view.h"
112 #include "components/prefs/pref_service.h"
113 #include "components/sessions/core/tab_restore_service.h" 113 #include "components/sessions/core/tab_restore_service.h"
114 #include "components/signin/core/common/profile_management_switches.h" 114 #include "components/signin/core/common/profile_management_switches.h"
115 #include "components/translate/core/browser/language_state.h" 115 #include "components/translate/core/browser/language_state.h"
116 #include "content/app/resources/grit/content_resources.h" 116 #include "content/app/resources/grit/content_resources.h"
117 #include "content/public/browser/download_manager.h" 117 #include "content/public/browser/download_manager.h"
118 #include "content/public/browser/notification_service.h" 118 #include "content/public/browser/notification_service.h"
119 #include "content/public/browser/render_frame_host.h" 119 #include "content/public/browser/render_frame_host.h"
120 #include "content/public/browser/render_view_host.h" 120 #include "content/public/browser/render_view_host.h"
121 #include "content/public/browser/render_widget_host_view.h" 121 #include "content/public/browser/render_widget_host_view.h"
122 #include "content/public/browser/user_metrics.h" 122 #include "content/public/browser/user_metrics.h"
(...skipping 2595 matching lines...) Expand 10 before | Expand all | Expand 10 after
2718 return immersive_mode_controller()->IsEnabled(); 2718 return immersive_mode_controller()->IsEnabled();
2719 } 2719 }
2720 2720
2721 views::Widget* BrowserView::GetBubbleAssociatedWidget() { 2721 views::Widget* BrowserView::GetBubbleAssociatedWidget() {
2722 return GetWidget(); 2722 return GetWidget();
2723 } 2723 }
2724 2724
2725 gfx::Rect BrowserView::GetTopContainerBoundsInScreen() { 2725 gfx::Rect BrowserView::GetTopContainerBoundsInScreen() {
2726 return top_container_->GetBoundsInScreen(); 2726 return top_container_->GetBoundsInScreen();
2727 } 2727 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/first_run_dialog.cc ('k') | chrome/browser/ui/views/frame/browser_view_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698