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

Side by Side Diff: content/browser/web_contents/web_contents_impl.cc

Issue 382643002: Rename brand-color to theme-color. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 5 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 | Annotate | Revision Log
« no previous file with comments | « content/browser/web_contents/web_contents_impl.h ('k') | content/common/frame_messages.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "content/browser/web_contents/web_contents_impl.h" 5 #include "content/browser/web_contents/web_contents_impl.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/debug/trace_event.h" 10 #include "base/debug/trace_event.h"
(...skipping 488 matching lines...) Expand 10 before | Expand all | Expand 10 after
499 return true; 499 return true;
500 render_view_message_source_ = render_view_host; 500 render_view_message_source_ = render_view_host;
501 } 501 }
502 502
503 bool handled = true; 503 bool handled = true;
504 IPC_BEGIN_MESSAGE_MAP(WebContentsImpl, message) 504 IPC_BEGIN_MESSAGE_MAP(WebContentsImpl, message)
505 IPC_MESSAGE_HANDLER(FrameHostMsg_PepperPluginHung, OnPepperPluginHung) 505 IPC_MESSAGE_HANDLER(FrameHostMsg_PepperPluginHung, OnPepperPluginHung)
506 IPC_MESSAGE_HANDLER(FrameHostMsg_PluginCrashed, OnPluginCrashed) 506 IPC_MESSAGE_HANDLER(FrameHostMsg_PluginCrashed, OnPluginCrashed)
507 IPC_MESSAGE_HANDLER(FrameHostMsg_DomOperationResponse, 507 IPC_MESSAGE_HANDLER(FrameHostMsg_DomOperationResponse,
508 OnDomOperationResponse) 508 OnDomOperationResponse)
509 IPC_MESSAGE_HANDLER(FrameHostMsg_DidChangeBrandColor, 509 IPC_MESSAGE_HANDLER(FrameHostMsg_DidChangeThemeColor,
510 OnBrandColorChanged) 510 OnThemeColorChanged)
511 IPC_MESSAGE_HANDLER(FrameHostMsg_DidFinishDocumentLoad, 511 IPC_MESSAGE_HANDLER(FrameHostMsg_DidFinishDocumentLoad,
512 OnDocumentLoadedInFrame) 512 OnDocumentLoadedInFrame)
513 IPC_MESSAGE_HANDLER(FrameHostMsg_DidFinishLoad, OnDidFinishLoad) 513 IPC_MESSAGE_HANDLER(FrameHostMsg_DidFinishLoad, OnDidFinishLoad)
514 IPC_MESSAGE_HANDLER(FrameHostMsg_DidStartLoading, OnDidStartLoading) 514 IPC_MESSAGE_HANDLER(FrameHostMsg_DidStartLoading, OnDidStartLoading)
515 IPC_MESSAGE_HANDLER(FrameHostMsg_DidStopLoading, OnDidStopLoading) 515 IPC_MESSAGE_HANDLER(FrameHostMsg_DidStopLoading, OnDidStopLoading)
516 IPC_MESSAGE_HANDLER(FrameHostMsg_DidChangeLoadProgress, 516 IPC_MESSAGE_HANDLER(FrameHostMsg_DidChangeLoadProgress,
517 OnDidChangeLoadProgress) 517 OnDidChangeLoadProgress)
518 IPC_MESSAGE_HANDLER(FrameHostMsg_OpenColorChooser, OnOpenColorChooser) 518 IPC_MESSAGE_HANDLER(FrameHostMsg_OpenColorChooser, OnOpenColorChooser)
519 IPC_MESSAGE_HANDLER(FrameHostMsg_EndColorChooser, OnEndColorChooser) 519 IPC_MESSAGE_HANDLER(FrameHostMsg_EndColorChooser, OnEndColorChooser)
520 IPC_MESSAGE_HANDLER(FrameHostMsg_SetSelectedColorInColorChooser, 520 IPC_MESSAGE_HANDLER(FrameHostMsg_SetSelectedColorInColorChooser,
(...skipping 2016 matching lines...) Expand 10 before | Expand all | Expand 10 after
2537 // Disable overscroll when touch emulation is on. See crbug.com/369938. 2537 // Disable overscroll when touch emulation is on. See crbug.com/369938.
2538 if (touch_emulation_enabled_) 2538 if (touch_emulation_enabled_)
2539 return false; 2539 return false;
2540 2540
2541 if (delegate_) 2541 if (delegate_)
2542 return delegate_->CanOverscrollContent(); 2542 return delegate_->CanOverscrollContent();
2543 2543
2544 return false; 2544 return false;
2545 } 2545 }
2546 2546
2547 void WebContentsImpl::OnBrandColorChanged(SkColor brand_color) { 2547 void WebContentsImpl::OnThemeColorChanged(SkColor theme_color) {
2548 FOR_EACH_OBSERVER(WebContentsObserver, observers_, 2548 FOR_EACH_OBSERVER(WebContentsObserver, observers_,
2549 DidChangeBrandColor(brand_color)); 2549 DidChangeThemeColor(theme_color));
2550 } 2550 }
2551 2551
2552 void WebContentsImpl::OnDidLoadResourceFromMemoryCache( 2552 void WebContentsImpl::OnDidLoadResourceFromMemoryCache(
2553 const GURL& url, 2553 const GURL& url,
2554 const std::string& security_info, 2554 const std::string& security_info,
2555 const std::string& http_method, 2555 const std::string& http_method,
2556 const std::string& mime_type, 2556 const std::string& mime_type,
2557 ResourceType::Type resource_type) { 2557 ResourceType::Type resource_type) {
2558 base::StatsCounter cache("WebKit.CacheHit"); 2558 base::StatsCounter cache("WebKit.CacheHit");
2559 cache.Increment(); 2559 cache.Increment();
(...skipping 1582 matching lines...) Expand 10 before | Expand all | Expand 10 after
4142 if (new_size != old_size) 4142 if (new_size != old_size)
4143 delegate_->UpdatePreferredSize(this, new_size); 4143 delegate_->UpdatePreferredSize(this, new_size);
4144 } 4144 }
4145 4145
4146 void WebContentsImpl::ResumeResponseDeferredAtStart() { 4146 void WebContentsImpl::ResumeResponseDeferredAtStart() {
4147 FrameTreeNode* node = frame_tree_.root(); 4147 FrameTreeNode* node = frame_tree_.root();
4148 node->render_manager()->ResumeResponseDeferredAtStart(); 4148 node->render_manager()->ResumeResponseDeferredAtStart();
4149 } 4149 }
4150 4150
4151 } // namespace content 4151 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/web_contents/web_contents_impl.h ('k') | content/common/frame_messages.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698