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

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

Issue 643103003: Use app_list_service_disabled in Athena (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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_frame.h" 5 #include "chrome/browser/ui/views/frame/browser_frame.h"
6 6
7 #include "ash/shell.h" 7 #include "ash/shell.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/debug/leak_annotations.h" 9 #include "base/debug/leak_annotations.h"
10 #include "base/i18n/rtl.h" 10 #include "base/i18n/rtl.h"
11 #include "chrome/browser/app_mode/app_mode_utils.h" 11 #include "chrome/browser/app_mode/app_mode_utils.h"
12 #include "chrome/browser/themes/theme_service.h" 12 #include "chrome/browser/themes/theme_service.h"
13 #include "chrome/browser/themes/theme_service_factory.h" 13 #include "chrome/browser/themes/theme_service_factory.h"
14 #include "chrome/browser/ui/ash/ash_init.h" 14 #include "chrome/browser/ui/ash/ash_util.h"
15 #include "chrome/browser/ui/browser.h" 15 #include "chrome/browser/ui/browser.h"
16 #include "chrome/browser/ui/browser_list.h" 16 #include "chrome/browser/ui/browser_list.h"
17 #include "chrome/browser/ui/browser_window_state.h" 17 #include "chrome/browser/ui/browser_window_state.h"
18 #include "chrome/browser/ui/views/frame/browser_non_client_frame_view.h" 18 #include "chrome/browser/ui/views/frame/browser_non_client_frame_view.h"
19 #include "chrome/browser/ui/views/frame/browser_root_view.h" 19 #include "chrome/browser/ui/views/frame/browser_root_view.h"
20 #include "chrome/browser/ui/views/frame/browser_view.h" 20 #include "chrome/browser/ui/views/frame/browser_view.h"
21 #include "chrome/browser/ui/views/frame/immersive_mode_controller.h" 21 #include "chrome/browser/ui/views/frame/immersive_mode_controller.h"
22 #include "chrome/browser/ui/views/frame/native_browser_frame.h" 22 #include "chrome/browser/ui/views/frame/native_browser_frame.h"
23 #include "chrome/browser/ui/views/frame/native_browser_frame_factory.h" 23 #include "chrome/browser/ui/views/frame/native_browser_frame_factory.h"
24 #include "chrome/browser/ui/views/frame/system_menu_model_builder.h" 24 #include "chrome/browser/ui/views/frame/system_menu_model_builder.h"
(...skipping 281 matching lines...) Expand 10 before | Expand all | Expand 10 after
306 bool BrowserFrame::ShouldLeaveOffsetNearTopBorder() { 306 bool BrowserFrame::ShouldLeaveOffsetNearTopBorder() {
307 return !IsMaximized(); 307 return !IsMaximized();
308 } 308 }
309 309
310 void BrowserFrame::OnUseCustomChromeFrameChanged() { 310 void BrowserFrame::OnUseCustomChromeFrameChanged() {
311 // Tell the window manager to add or remove system borders. 311 // Tell the window manager to add or remove system borders.
312 set_frame_type(UseCustomFrame() ? Widget::FRAME_TYPE_FORCE_CUSTOM 312 set_frame_type(UseCustomFrame() ? Widget::FRAME_TYPE_FORCE_CUSTOM
313 : Widget::FRAME_TYPE_FORCE_NATIVE); 313 : Widget::FRAME_TYPE_FORCE_NATIVE);
314 FrameTypeChanged(); 314 FrameTypeChanged();
315 } 315 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698